From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 714F945903; Wed, 4 Sep 2024 16:03:22 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 33D2C4025A; Wed, 4 Sep 2024 16:03:22 +0200 (CEST) Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.9]) by mails.dpdk.org (Postfix) with ESMTP id 3305B4014F for ; Wed, 4 Sep 2024 16:03:18 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1725458600; x=1756994600; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=8dUBR0IdBD3R0ngXK3WO2xoNPlqfi9ASGS9a718t1Yc=; b=AoMmdn71dZHe1jAmaC94jLW1bToIMOpC1n+wBJw/vMs24nSjCEjaHRPV BB9Kx/OYPgM81s6PGt0h4N/Xnk0ftURYl6YSNeGMa4KmrVKEU9M7SOPCH 4soRNp74hf+m6k6MKgAs37NA8Lum0fWmHYKc9CxkTTxvNlBAIRyoHuiIg HlQu5nOkLJ7Fxuqbt0Lnz5Xtax4pBFtlrXuJrMVcxRx5SxWGunsgMtFg6 Rod2IzxUQxWUIr+XKYLl1+cBmApV9cMlnMFIqbCESxIE7bjcYuonXxItO Kd6ZrC6slFThNajI0C3L6/c+o8HrBDHiHvx7vSk4eRaNEl/QojtVX9gTs g==; X-CSE-ConnectionGUID: jvRGTCYuTIClrq9hBGr5Jg== X-CSE-MsgGUID: aSTKa6D0TViwB0v6n0wWHQ== X-IronPort-AV: E=McAfee;i="6700,10204,11185"; a="34784355" X-IronPort-AV: E=Sophos;i="6.10,202,1719903600"; d="scan'208";a="34784355" Received: from orviesa008.jf.intel.com ([10.64.159.148]) by fmvoesa103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Sep 2024 07:03:17 -0700 X-CSE-ConnectionGUID: S6r/3GMqRMKj18CSjwzHOw== X-CSE-MsgGUID: UeC8vGuDTxmMHWeohrTSzA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.10,202,1719903600"; d="scan'208";a="66013039" Received: from unknown (HELO silpixa00401385.ir.intel.com) ([10.237.214.39]) by orviesa008.jf.intel.com with ESMTP; 04 Sep 2024 07:03:17 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: Bruce Richardson Subject: [RFC PATCH] devtools/test-meson-builds: use cross file for 32bit build Date: Wed, 4 Sep 2024 15:03:02 +0100 Message-ID: <20240904140313.333098-1-bruce.richardson@intel.com> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org When testing the 32-bit x86 build on debian or ubuntu linux systems, use the cross-file rather than using args and pkgconfig environment variable. The advantage of using the cross-file is that the paths are saved across runs. While the '-m32' args settings are preserved in the current setup, the PKG_CONFIG_LIBDIR value from environment is not, which can cause rebuilds of the build-32b directory to fail if meson needs to do a reconfiguration first. Signed-off-by: Bruce Richardson --- devtools/test-meson-builds.sh | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/devtools/test-meson-builds.sh b/devtools/test-meson-builds.sh index d71bb1ded0..1d9d04ce7c 100755 --- a/devtools/test-meson-builds.sh +++ b/devtools/test-meson-builds.sh @@ -253,21 +253,24 @@ build build-x86-generic cc skipABI -Dcheck_includes=true \ # 32-bit with default compiler if check_cc_flags '-m32' ; then + target_override='i386-pc-linux-gnu' if [ -d '/usr/lib/i386-linux-gnu' ] ; then - # 32-bit pkgconfig on Debian/Ubuntu - export PKG_CONFIG_LIBDIR='/usr/lib/i386-linux-gnu/pkgconfig' + # 32-bit pkgconfig on Debian/Ubuntu, use cross file + build build-32b $srcdir/config/x86/cross-debian-32bit ABI elif [ -d '/usr/lib32' ] ; then # 32-bit pkgconfig on Arch export PKG_CONFIG_LIBDIR='/usr/lib32/pkgconfig' + build build-32b cc ABI -Dc_args='-m32' -Dc_link_args='-m32' \ + -Dcpp_args='-m32' -Dcpp_link_args='-m32' + unset PKG_CONFIG_LIBDIR else # 32-bit pkgconfig on RHEL/Fedora (lib vs lib64) export PKG_CONFIG_LIBDIR='/usr/lib/pkgconfig' + build build-32b cc ABI -Dc_args='-m32' -Dc_link_args='-m32' \ + -Dcpp_args='-m32' -Dcpp_link_args='-m32' + unset PKG_CONFIG_LIBDIR fi - target_override='i386-pc-linux-gnu' - build build-32b cc ABI -Dc_args='-m32' -Dc_link_args='-m32' \ - -Dcpp_args='-m32' -Dcpp_link_args='-m32' target_override= - unset PKG_CONFIG_LIBDIR fi # x86 MinGW -- 2.43.0