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 9A05C45913; Fri, 6 Sep 2024 18:13:20 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8C88542FB1; Fri, 6 Sep 2024 18:13:04 +0200 (CEST) Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.13]) by mails.dpdk.org (Postfix) with ESMTP id 2D52042FAF for ; Fri, 6 Sep 2024 18:13:03 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1725639183; x=1757175183; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=pL/Ptqt3vAlgYMaZIReHtHjIHXVmR4/Rjvqqemo87vo=; b=KIb+KS1loWkg5nya1sVlnsidzsjiX71nHhEXMnTUFo+lDiucmUeSojjx OHDH4fdMTcZjK+aP/yUfyh7R+jZHYUicUXsOv0YQksE4RoI/SnvBe/P+b skUokLO8sHGnmmUwGzsAjExYZxFQgNoc3SeDzZrz19/md3hJ7NbaPgeow SVDLkgypsB6qvKPDC8aCWNVQN2B+ETjsY20Kg7nhYFXDZgkThKZXrtZZ7 DR7MX/Bu+K8tS6vEVlATG8p+G0gi8p/bEGpyOKbUhyhqqOhFlViOx1Rsx hEdgshOOiaqd0Zk/9vwGMEz+1fxHvCBe8VabdHQvd9Gu6b1tc/ysUTqsW g==; X-CSE-ConnectionGUID: quyFX+R2SbqrfoKbzbshyw== X-CSE-MsgGUID: MxXTnjoYSyWthUfXWp3h9Q== X-IronPort-AV: E=McAfee;i="6700,10204,11187"; a="27329875" X-IronPort-AV: E=Sophos;i="6.10,208,1719903600"; d="scan'208";a="27329875" Received: from fmviesa009.fm.intel.com ([10.60.135.149]) by fmvoesa107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Sep 2024 09:13:03 -0700 X-CSE-ConnectionGUID: SuyV8/ghQF2qQo3tCk8ypw== X-CSE-MsgGUID: uAmO8HBZS5uYf2W2MMCSLQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.10,208,1719903600"; d="scan'208";a="65986578" Received: from unknown (HELO silpixa00401385.ir.intel.com) ([10.237.214.39]) by fmviesa009.fm.intel.com with ESMTP; 06 Sep 2024 09:13:02 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: Bruce Richardson Subject: [PATCH v2 4/4] devtools/test-meson-builds: use cross files for 32bit build Date: Fri, 6 Sep 2024 17:12:44 +0100 Message-ID: <20240906161244.1663967-5-bruce.richardson@intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240906161244.1663967-1-bruce.richardson@intel.com> References: <20240904135939.329324-1-bruce.richardson@intel.com> <20240906161244.1663967-1-bruce.richardson@intel.com> 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, use a 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. Without this patch, while the '-m32' args settings are preserved between meson runs, 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 | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/devtools/test-meson-builds.sh b/devtools/test-meson-builds.sh index d71bb1ded0..4fff1f7177 100755 --- a/devtools/test-meson-builds.sh +++ b/devtools/test-meson-builds.sh @@ -253,21 +253,18 @@ 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-32bit-debian.ini ABI elif [ -d '/usr/lib32' ] ; then # 32-bit pkgconfig on Arch - export PKG_CONFIG_LIBDIR='/usr/lib32/pkgconfig' + build build-32b $srcdir/config/x86/cross-32bit-arch.ini ABI else # 32-bit pkgconfig on RHEL/Fedora (lib vs lib64) - export PKG_CONFIG_LIBDIR='/usr/lib/pkgconfig' + build build-32b $srcdir/config/x86/cross-32bit-fedora.ini ABI 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