From patchwork Mon Nov 9 13:00:35 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ferruh Yigit X-Patchwork-Id: 83846 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 032ACA0527; Mon, 9 Nov 2020 14:00:43 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id D9B645F13; Mon, 9 Nov 2020 14:00:41 +0100 (CET) Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by dpdk.org (Postfix) with ESMTP id E86FA2B9D for ; Mon, 9 Nov 2020 14:00:39 +0100 (CET) IronPort-SDR: 26TVpKyLOSHrppZjHs4/4p1E9fs7eswmaik27UJb/PxmPfQLtIkQ6kLHWDUosXPpfW7dBv3Rk9 k8kv698FGhjQ== X-IronPort-AV: E=McAfee;i="6000,8403,9799"; a="254501262" X-IronPort-AV: E=Sophos;i="5.77,463,1596524400"; d="scan'208";a="254501262" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Nov 2020 05:00:38 -0800 IronPort-SDR: cmcFPlJ5PvdyyEDmX2oQKmFcbx6btursDNZBN7brV4LwKkp++x9HfEi0R+g5eLBr4CD8VVmD4c D8FCAqccwdGw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.77,463,1596524400"; d="scan'208";a="540845178" Received: from silpixa00399752.ir.intel.com (HELO silpixa00399752.ger.corp.intel.com) ([10.237.222.180]) by orsmga005.jf.intel.com with ESMTP; 09 Nov 2020 05:00:36 -0800 From: Ferruh Yigit To: dev@dpdk.org, Bruce Richardson , Thomas Monjalon Cc: Ferruh Yigit Date: Mon, 9 Nov 2020 13:00:35 +0000 Message-Id: <20201109130035.3948462-1-ferruh.yigit@intel.com> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH] devtools: fix 32-bits build X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" 32 bit still uses the pkgconfig file for 64-bits libraries, from the build log: " Using DPDK_TARGET i386-pc-linux-gnu meson -Dexamples=l3fwd --buildtype=debugoptimized --werror -Dc_args=-m32 -Dc_link_args=-m32 /tmp/dpdk_maintain/self/dpdk/devtools/.. ./build-32b ... Using 'PKG_CONFIG_PATH' from environment with value: '/usr/local/lib64/pkgconfig/ " This causes build error when linking with the found libraries. Reproduced with 'librte_bpf' which only has 64 bit installed but still enables building 'af_xdp' and link fails. To fix updating 'PKG_CONFIG_PATH' and preventing 'load_env' overwrite it. Fixes: 9b83106d8784 ("devtools: test 32-bit build") Signed-off-by: Ferruh Yigit --- Cc: Bruce Richardson Cc: Thomas Monjalon 'build-32b' check inside the 'load_env' looks ugly but not sure how to be sure 'PKG_CONFIG_PATH' set correct. --- devtools/test-meson-builds.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/devtools/test-meson-builds.sh b/devtools/test-meson-builds.sh index 0c95d1cc98..9e44359398 100755 --- a/devtools/test-meson-builds.sh +++ b/devtools/test-meson-builds.sh @@ -53,7 +53,9 @@ load_env () # { targetcc=$1 export PATH=$default_path - export PKG_CONFIG_PATH=$default_pkgpath + if [ "$targetdir" != "build-32b" ] ; then + export PKG_CONFIG_PATH=$default_pkgpath + fi export CPPFLAGS=$default_cppflags export CFLAGS=$default_cflags export LDFLAGS=$default_ldflags @@ -226,10 +228,12 @@ if check_cc_flags '-m32' ; then # 32-bit pkgconfig on RHEL/Fedora (lib vs lib64) export PKG_CONFIG_LIBDIR='/usr/lib/pkgconfig' fi + export PKG_CONFIG_PATH=$PKG_CONFIG_LIBDIR target_override='i386-pc-linux-gnu' build build-32b cc -Dc_args='-m32' -Dc_link_args='-m32' target_override= unset PKG_CONFIG_LIBDIR + unset PKG_CONFIG_PATH fi # x86 MinGW