diff options
author | Matias Elo <matias.elo@nokia.com> | 2020-02-12 16:24:45 +0200 |
---|---|---|
committer | Matias Elo <matias.elo@nokia.com> | 2020-02-26 14:13:48 +0200 |
commit | 9dc2dcff30a5bf8963b9947343cf79fe63013932 (patch) | |
tree | aeff89239ea56a52b68bc58aa42fbf042780abb3 /scripts | |
parent | f974cb930ffb6bc1f0084b23f8d2e877b75e44db (diff) |
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>
Diffstat (limited to 'scripts')
-rwxr-xr-x | scripts/ci/build_arm64.sh | 4 | ||||
-rwxr-xr-x | scripts/ci/build_armhf.sh | 4 | ||||
-rwxr-xr-x | scripts/ci/build_i386.sh | 4 | ||||
-rwxr-xr-x | scripts/ci/build_ppc64el.sh | 4 |
4 files changed, 16 insertions, 0 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 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 |