From patchwork Wed Mar 6 16:22:41 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 50882 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id DA91F1B13A; Wed, 6 Mar 2019 17:23:04 +0100 (CET) Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by dpdk.org (Postfix) with ESMTP id 792D31B1F1 for ; Wed, 6 Mar 2019 17:23:03 +0100 (CET) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 06 Mar 2019 08:23:03 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.58,448,1544515200"; d="scan'208";a="304909477" Received: from silpixa00399126.ir.intel.com (HELO silpixa00399126.ger.corp.intel.com) ([10.237.222.236]) by orsmga005.jf.intel.com with ESMTP; 06 Mar 2019 08:23:02 -0800 From: Bruce Richardson To: dev@dpdk.org Cc: Bruce Richardson Date: Wed, 6 Mar 2019 16:22:41 +0000 Message-Id: <20190306162242.65375-6-bruce.richardson@intel.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190306162242.65375-1-bruce.richardson@intel.com> References: <20190306162242.65375-1-bruce.richardson@intel.com> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH 5/6] build/meson: change linuxapp to linux in meson cross files 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" Rename the cross files for meson compilation from having linuxapp in the name to just linux in the name. Signed-off-by: Bruce Richardson --- .../arm/{arm64_armv8_linuxapp_gcc => arm64_armv8_linux_gcc} | 0 .../arm/{arm64_dpaa2_linuxapp_gcc => arm64_dpaa2_linux_gcc} | 0 config/arm/{arm64_dpaa_linuxapp_gcc => arm64_dpaa_linux_gcc} | 0 .../{arm64_thunderx_linuxapp_gcc => arm64_thunderx_linux_gcc} | 0 devtools/test-meson-builds.sh | 2 +- doc/build-sdk-meson.txt | 4 ++-- 6 files changed, 3 insertions(+), 3 deletions(-) rename config/arm/{arm64_armv8_linuxapp_gcc => arm64_armv8_linux_gcc} (100%) rename config/arm/{arm64_dpaa2_linuxapp_gcc => arm64_dpaa2_linux_gcc} (100%) rename config/arm/{arm64_dpaa_linuxapp_gcc => arm64_dpaa_linux_gcc} (100%) rename config/arm/{arm64_thunderx_linuxapp_gcc => arm64_thunderx_linux_gcc} (100%) diff --git a/config/arm/arm64_armv8_linuxapp_gcc b/config/arm/arm64_armv8_linux_gcc similarity index 100% rename from config/arm/arm64_armv8_linuxapp_gcc rename to config/arm/arm64_armv8_linux_gcc diff --git a/config/arm/arm64_dpaa2_linuxapp_gcc b/config/arm/arm64_dpaa2_linux_gcc similarity index 100% rename from config/arm/arm64_dpaa2_linuxapp_gcc rename to config/arm/arm64_dpaa2_linux_gcc diff --git a/config/arm/arm64_dpaa_linuxapp_gcc b/config/arm/arm64_dpaa_linux_gcc similarity index 100% rename from config/arm/arm64_dpaa_linuxapp_gcc rename to config/arm/arm64_dpaa_linux_gcc diff --git a/config/arm/arm64_thunderx_linuxapp_gcc b/config/arm/arm64_thunderx_linux_gcc similarity index 100% rename from config/arm/arm64_thunderx_linuxapp_gcc rename to config/arm/arm64_thunderx_linux_gcc diff --git a/devtools/test-meson-builds.sh b/devtools/test-meson-builds.sh index e59474d53..f81a71434 100755 --- a/devtools/test-meson-builds.sh +++ b/devtools/test-meson-builds.sh @@ -51,7 +51,7 @@ if command -v $c >/dev/null 2>&1 ; then # compile the general v8a also for clang to increase coverage export CC="ccache clang" build build-arm64-host-clang $use_shared \ - --cross-file config/arm/arm64_armv8_linuxapp_gcc + --cross-file config/arm/arm64_armv8_linux_gcc for f in config/arm/arm*gcc ; do export CC="ccache gcc" diff --git a/doc/build-sdk-meson.txt b/doc/build-sdk-meson.txt index 0a3316386..912cb3a8c 100644 --- a/doc/build-sdk-meson.txt +++ b/doc/build-sdk-meson.txt @@ -157,9 +157,9 @@ command:: For example if the target machine is arm64 we can use the following command:: - meson arm-build --cross-file config/arm/arm64_armv8_linuxapp_gcc + meson arm-build --cross-file config/arm/arm64_armv8_linux_gcc -where config/arm/arm64_armv8_linuxapp_gcc contains the following +where config/arm/arm64_armv8_linux_gcc contains the following parameters:: [binaries]