From f974cb930ffb6bc1f0084b23f8d2e877b75e44db Mon Sep 17 00:00:00 2001
From: Matias Elo <matias.elo@nokia.com>
Date: Tue, 11 Feb 2020 15:37:45 +0200
Subject: travis: change default ubuntu container version to 18.04

Separate DPDK v18.11 test has been removed. DPDK v18.11 is used now by
default in Ubuntu 18.04 x86 builds. DPDK v17.11 is still used in Ubuntu
16.04 builds.

Signed-off-by: Matias Elo <matias.elo@nokia.com>
Reviewed-by: Petri Savolainen <petri.savolainen@nokia.com>
---
 scripts/ci/build_armhf.sh   |  4 +++-
 scripts/ci/build_powerpc.sh | 15 ---------------
 scripts/ci/build_ppc64el.sh | 16 ++++++++++++++++
 3 files changed, 19 insertions(+), 16 deletions(-)
 delete mode 100755 scripts/ci/build_powerpc.sh
 create mode 100755 scripts/ci/build_ppc64el.sh

(limited to 'scripts/ci')

diff --git a/scripts/ci/build_armhf.sh b/scripts/ci/build_armhf.sh
index 837561f83..c13acaa08 100755
--- a/scripts/ci/build_armhf.sh
+++ b/scripts/ci/build_armhf.sh
@@ -9,8 +9,10 @@ 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"
 export CXXFLAGS="-march=armv7-a"
 
+# No DPDK on ARMv7
+export CONF="${CONF} --disable-dpdk"
+
 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..ca094c901
--- /dev/null
+++ b/scripts/ci/build_ppc64el.sh
@@ -0,0 +1,16 @@
+#!/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"
+
+exec "$(dirname "$0")"/build.sh
-- 
cgit v1.2.3


From 9dc2dcff30a5bf8963b9947343cf79fe63013932 Mon Sep 17 00:00:00 2001
From: Matias Elo <matias.elo@nokia.com>
Date: Wed, 12 Feb 2020 16:24:45 +0200
Subject: ci: use correct paths for pkg-config when cross compiling

Signed-off-by: Matias Elo <matias.elo@nokia.com>
Reviewed-by: Petri Savolainen <petri.savolainen@nokia.com>
---
 scripts/ci/build_arm64.sh   | 4 ++++
 scripts/ci/build_armhf.sh   | 4 ++++
 scripts/ci/build_i386.sh    | 4 ++++
 scripts/ci/build_ppc64el.sh | 4 ++++
 4 files changed, 16 insertions(+)

(limited to 'scripts/ci')

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 c13acaa08..4ae0f19b1 100755
--- a/scripts/ci/build_armhf.sh
+++ b/scripts/ci/build_armhf.sh
@@ -15,4 +15,8 @@ export CXXFLAGS="-march=armv7-a"
 # No DPDK on ARMv7
 export CONF="${CONF} --disable-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_i386.sh b/scripts/ci/build_i386.sh
index 17b6bf668..797dd454d 100755
--- a/scripts/ci/build_i386.sh
+++ b/scripts/ci/build_i386.sh
@@ -12,4 +12,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_ppc64el.sh b/scripts/ci/build_ppc64el.sh
index ca094c901..984481bb5 100755
--- a/scripts/ci/build_ppc64el.sh
+++ b/scripts/ci/build_ppc64el.sh
@@ -13,4 +13,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
-- 
cgit v1.2.3