From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id C82F5A2EEB for ; Sat, 14 Sep 2019 11:05:52 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 623551DFEC; Sat, 14 Sep 2019 11:05:51 +0200 (CEST) Received: from out5-smtp.messagingengine.com (out5-smtp.messagingengine.com [66.111.4.29]) by dpdk.org (Postfix) with ESMTP id DD5FE1D44B for ; Sat, 14 Sep 2019 11:05:48 +0200 (CEST) Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.nyi.internal (Postfix) with ESMTP id 47F3B21B2F; Sat, 14 Sep 2019 05:05:47 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute1.internal (MEProxy); Sat, 14 Sep 2019 05:05:47 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=monjalon.net; h= from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; s=mesmtp; bh=6+60XdwYR7C6kW6lq80Xy/I jnNMZovHaKsJWpfVShg4=; b=M2qcJqQfymklXEBhoZrNlVqJV/dPqHT3nrPBJby EUQqmoocEDF447N3zXz4r8Vcz9db1x4iKadqs4S9bOD+o93vlorCqSdneYXs8wVx t0trsrf3K7tmSSfSMwY0uWubqZqhpy/67l9Ba06o3kH61Mzt7zv0/ZOMgKz6rI9v 1uzQ= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:date:from :message-id:mime-version:subject:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm3; bh=6+60XdwYR7C6kW6lq 80Xy/IjnNMZovHaKsJWpfVShg4=; b=JFxl94ejiPJ6Sq7mhQrgXzqbTGdsQy/Tt YtOqrWrhQOT3fPN0XZlQlRouktjpFWXKW4a/OjLw+mNhY+Nwv+AeIpYLat9DLdlv jk5LG0nNJA8bgGoGoKWjS+WOvaMMQ4rr72hbHVLkniGLbiVSyMzSlvUmd1oomx2D YtaobCk6r5HLDdeTcaBZCjGhfX3qYfuomd6hHwFZcxTZeY4PiZC/t74T6EPoeLsr 0GuTwevWaVmG4Akw5ywB3hoQKS9kn2WMheu3gNhoymApv1xgBJZCdSheE4i841BY BY22JFqRacx9osLFlHha8QfvaA1r3wur/0dphV/upjzmLExKTS2ag== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedufedrtdelgdduudcutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffoggfgsedtkeertdertd dtnecuhfhrohhmpefvhhhomhgrshcuofhonhhjrghlohhnuceothhhohhmrghssehmohhn jhgrlhhonhdrnhgvtheqnecukfhppeejjedrudefgedrvddtfedrudekgeenucfrrghrrg hmpehmrghilhhfrhhomhepthhhohhmrghssehmohhnjhgrlhhonhdrnhgvthenucevlhhu shhtvghrufhiiigvpedt X-ME-Proxy: Received: from xps.monjalon.net (184.203.134.77.rev.sfr.net [77.134.203.184]) by mail.messagingengine.com (Postfix) with ESMTPA id 411908005C; Sat, 14 Sep 2019 05:05:46 -0400 (EDT) From: Thomas Monjalon To: bruce.richardson@intel.com Cc: bluca@debian.org, dev@dpdk.org Date: Sat, 14 Sep 2019 11:04:47 +0200 Message-Id: <20190914090447.5707-1-thomas@monjalon.net> X-Mailer: git-send-email 2.23.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-dev] [PATCH] devtools: fix test of ninja install 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" When trying to compile some examples with libdpdk.pc, the right environment (for default target) was not loaded. The consequence is to not detect some dependencies because of missing directories in PKG_CONFIG_PATH. The environment preparation is moved to a dedicate function, and called for the default target (cc), before testing the install output of the default build. Signed-off-by: Thomas Monjalon --- devtools/test-meson-builds.sh | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/devtools/test-meson-builds.sh b/devtools/test-meson-builds.sh index 2eb9b23b0..08e83eb5c 100755 --- a/devtools/test-meson-builds.sh +++ b/devtools/test-meson-builds.sh @@ -37,11 +37,15 @@ fi default_path=$PATH default_pkgpath=$PKG_CONFIG_PATH -reset_env () +load_env () # { + targetcc=$1 export PATH=$default_path export PKG_CONFIG_PATH=$default_pkgpath unset DPDK_MESON_OPTIONS + command -v $targetcc >/dev/null 2>&1 || return 1 + DPDK_TARGET=$($targetcc -v 2>&1 | sed -n 's,^Target: ,,p') + . $srcdir/devtools/load-devel-config } build () # @@ -52,10 +56,7 @@ build () # shift # skip build if compiler not available command -v ${CC##* } >/dev/null 2>&1 || return 0 - command -v $targetcc >/dev/null 2>&1 || return 0 - reset_env - DPDK_TARGET=$($targetcc -v 2>&1 | sed -n 's,^Target: ,,p') - . $srcdir/devtools/load-devel-config + load_env $targetcc || return 0 if [ ! -f "$builddir/build.ninja" ] ; then options="--werror -Dexamples=all" for option in $DPDK_MESON_OPTIONS ; do @@ -128,6 +129,7 @@ build_path=build-x86-default export DESTDIR=$(pwd)/$build_path/install-root $ninja_cmd -C $build_path install +load_env cc pc_file=$(find $DESTDIR -name libdpdk.pc) export PKG_CONFIG_PATH=$(dirname $pc_file):$PKG_CONFIG_PATH -- 2.23.0