Merge pull request #90

Merge and port odp-linux patches up to 7b25b58be

5 files changed, 32 insertions, 16 deletions

diff --git a/scripts/ci/build_arm64.sh b/scripts/ci/build_arm64.sh
index 647dd29cf..abdc5acb8 100755
--- a/scripts/ci/build_arm64.sh
+++ b/scripts/ci/build_arm64.sh
@@ -11,4 +11,8 @@ else
 fi
 export CPPFLAGS="-I/usr/include/${TARGET_ARCH}/dpdk"
 
+# Use target libraries
+export PKG_CONFIG_PATH=
+export PKG_CONFIG_LIBDIR=/usr/lib/${TARGET_ARCH}/pkgconfig
+
 exec "$(dirname "$0")"/build.sh
diff --git a/scripts/ci/build_armhf.sh b/scripts/ci/build_armhf.sh
index aa42d7b36..36f54b047 100755
--- a/scripts/ci/build_armhf.sh
+++ b/scripts/ci/build_armhf.sh
@@ -9,8 +9,11 @@ else
 	export CC="${TARGET_ARCH}-gcc"
 	export CXX="${TARGET_ARCH}-g++"
 fi
-export CPPFLAGS="-I/usr/include/${TARGET_ARCH}/dpdk"
 export CFLAGS="-march=armv7-a -mfpu=neon"
 export CXXFLAGS="-march=armv7-a"
 
+# Use target libraries
+export PKG_CONFIG_PATH=
+export PKG_CONFIG_LIBDIR=/usr/lib/${TARGET_ARCH}/pkgconfig
+
 exec "$(dirname "$0")"/build.sh
diff --git a/scripts/ci/build_i386.sh b/scripts/ci/build_i386.sh
index 565359679..e49558bcc 100755
--- a/scripts/ci/build_i386.sh
+++ b/scripts/ci/build_i386.sh
@@ -13,4 +13,8 @@ else
 fi
 export CPPFLAGS="-I/usr/include/i386-linux-gnu/dpdk"
 
+# Use target libraries
+export PKG_CONFIG_PATH=
+export PKG_CONFIG_LIBDIR=/usr/lib/i386-linux-gnu/pkgconfig
+
 exec "$(dirname "$0")"/build.sh
diff --git a/scripts/ci/build_powerpc.sh b/scripts/ci/build_powerpc.sh
deleted file mode 100755
index a213ee1d3..000000000
--- a/scripts/ci/build_powerpc.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash
-set -e
-
-export TARGET_ARCH=powerpc-linux-gnu
-if [ "${CC#clang}" != "${CC}" ] ; then
-	export CC="clang --target=${TARGET_ARCH}"
-	export CXX="clang++ --target=${TARGET_ARCH}"
-else
-	export CC="${TARGET_ARCH}-gcc"
-	export CXX="${TARGET_ARCH}-g++"
-fi
-# No DPDK on PowerPC
-export CONF="${CONF} --disable-dpdk"
-
-exec "$(dirname "$0")"/build.sh
diff --git a/scripts/ci/build_ppc64el.sh b/scripts/ci/build_ppc64el.sh
new file mode 100755
index 000000000..984481bb5
--- /dev/null
+++ b/scripts/ci/build_ppc64el.sh
@@ -0,0 +1,20 @@
+#!/bin/bash
+set -e
+
+export TARGET_ARCH=powerpc64le-linux-gnu
+if [ "${CC#clang}" != "${CC}" ] ; then
+	export CC="clang --target=${TARGET_ARCH}"
+	export CXX="clang++ --target=${TARGET_ARCH}"
+	# DPDK clang build broken
+	export CONF="${CONF} --disable-dpdk"
+else
+	export CC="${TARGET_ARCH}-gcc"
+	export CXX="${TARGET_ARCH}-g++"
+fi
+export CPPFLAGS="-I/usr/include/${TARGET_ARCH}/dpdk"
+
+# Use target libraries
+export PKG_CONFIG_PATH=
+export PKG_CONFIG_LIBDIR=/usr/lib/${TARGET_ARCH}/pkgconfig
+
+exec "$(dirname "$0")"/build.sh