From: Bruce Richardson Date: Thu, 5 Nov 2020 17:21:45 +0000 (+0000) Subject: devtools: test 32-bit build X-Git-Url: http://git.droids-corp.org/?a=commitdiff_plain;h=9b83106d878412fb1142fa8571ce84c5ebabf1d5;p=dpdk.git devtools: test 32-bit build It's reasonably common for patches to have issues when built on 32-bits, so to prevent this, we can add a 32-bit build (if supported) to the "test-meson-builds.sh" script. The tricky bit is using a valid PKG_CONFIG_LIBDIR, so for now we use two common possibilities for where that should point to in order to get a successful build. Signed-off-by: Bruce Richardson Signed-off-by: Thomas Monjalon --- diff --git a/devtools/test-meson-builds.sh b/devtools/test-meson-builds.sh index a87de635a2..0c95d1cc98 100755 --- a/devtools/test-meson-builds.sh +++ b/devtools/test-meson-builds.sh @@ -43,6 +43,12 @@ default_cppflags=$CPPFLAGS default_cflags=$CFLAGS default_ldflags=$LDFLAGS +check_cc_flags () # ... +{ + echo 'int main(void) { return 0; }' | + cc $@ -x c - -o /dev/null 2> /dev/null +} + load_env () # { targetcc=$1 @@ -52,11 +58,14 @@ load_env () # export CFLAGS=$default_cflags export LDFLAGS=$default_ldflags unset DPDK_MESON_OPTIONS - if command -v $targetcc >/dev/null 2>&1 ; then + if [ -n "$target_override" ] ; then + DPDK_TARGET=$target_override + elif command -v $targetcc >/dev/null 2>&1 ; then DPDK_TARGET=$($targetcc -v 2>&1 | sed -n 's,^Target: ,,p') else # toolchain not yet in PATH: its name should be enough DPDK_TARGET=$targetcc fi + echo "Using DPDK_TARGET $DPDK_TARGET" # config input: $DPDK_TARGET . $srcdir/devtools/load-devel-config # config output: $DPDK_MESON_OPTIONS, $PATH, $PKG_CONFIG_PATH, etc @@ -200,12 +209,29 @@ done # Set the install path for libraries to "lib" explicitly to prevent problems # with pkg-config prefixes if installed in "lib/x86_64-linux-gnu" later. default_machine='nehalem' -ok=$(cc -march=$default_machine -E - < /dev/null > /dev/null 2>&1 || echo false) -if [ "$ok" = "false" ] ; then +if ! check_cc_flags "-march=$default_machine" ; then default_machine='corei7' fi build build-x86-default cc -Dlibdir=lib -Dmachine=$default_machine $use_shared +# 32-bit with default compiler +if check_cc_flags '-m32' ; then + if [ -d '/usr/lib/i386-linux-gnu' ] ; then + # 32-bit pkgconfig on Debian/Ubuntu + export PKG_CONFIG_LIBDIR='/usr/lib/i386-linux-gnu/pkgconfig' + elif [ -d '/usr/lib32' ] ; then + # 32-bit pkgconfig on Arch + export PKG_CONFIG_LIBDIR='/usr/lib32/pkgconfig' + else + # 32-bit pkgconfig on RHEL/Fedora (lib vs lib64) + export PKG_CONFIG_LIBDIR='/usr/lib/pkgconfig' + fi + target_override='i386-pc-linux-gnu' + build build-32b cc -Dc_args='-m32' -Dc_link_args='-m32' + target_override= + unset PKG_CONFIG_LIBDIR +fi + # x86 MinGW build build-x86-mingw $srcdir/config/x86/cross-mingw -Dexamples=helloworld