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 490B2A0552 for ; Mon, 27 Jun 2022 11:11:31 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 21E55400D5; Mon, 27 Jun 2022 11:11:31 +0200 (CEST) Received: from mail-lj1-f178.google.com (mail-lj1-f178.google.com [209.85.208.178]) by mails.dpdk.org (Postfix) with ESMTP id C68A9400D5 for ; Mon, 27 Jun 2022 11:11:29 +0200 (CEST) Received: by mail-lj1-f178.google.com with SMTP id r9so4897374ljp.9 for ; Mon, 27 Jun 2022 02:11:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=semihalf.com; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=0a81bz9XoPW1NIDKfIOtxH8cO36V6cYEdgibdELcGvM=; b=ZbFCOUP36jcBxXGQnHePGreob/PlzE+KFzLj/R4prjUanVs2ujSXwm53OI0TbbxiYB 3x85TGdp05XLWWHwy6xvCzQfQu+WPfDVOrG3fD3LSaBD98Fj7uosksEoqfkWC/Idx6AP JbNwJ8mljGXMvHIgtCW6yqaoSAde9jed2MgMBxQBNCPrcoqhPWpD8eieUi4XOFwUd18M gKqjWGtstq1HIrgWeqXJDQvymPNeqYeA58Z6T3+o8P6J90xvAVLExqCYIcj0RdTQVd2H gODx9f3Wufz2/J/ZMPQftXSmTcu9DPKb4sUxUpPZxugEC6XMgGUVzDtedqdnxQbMtuRx Ofiw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=0a81bz9XoPW1NIDKfIOtxH8cO36V6cYEdgibdELcGvM=; b=AN4ISLkSZzwWH7RTYF4B0ZH4aggHgde38DyGDfmpyWr2QIO+K9PDKXETE+CG72V9/q 4K9IdO251J4GOvpBOxsWUXbkh1gkmcboJqS9Ol7LZjtDqqtQsv4UkTqu5I5Q2igr3vZE /fWGi9hZC72tO95/oWKVxFPEyac6BRdNxPa55OYQJUq3wnH4Ony8MyUzVWoXKprixYdu vuiwJEtDlRBFt9G2h5RjKZ8eTonhLJvoBIaaQHk0lClG+KGzQ7oAOvZSbdI60GiECbAH LUnhvF5/4epJ6VLBWhSo5t6Q/+Qe9QxF2jhX8ZIc75mIzbTzx9pTdwRcb7NFcF5xjSBX xpNA== X-Gm-Message-State: AJIora90eNgcj+rP2c7Udt0mjiL/h2DegOcBdwCIP13gD9xUq8KZc7V0 Q7bDm5kqnRRtEVjQ6oYBQtTmMaR/j0Rw5s01 X-Google-Smtp-Source: AGRyM1sOW8L17KN3WJb+DOFdmDMD8PjfaMAWJu5QZQIrpqBkY1Kgp5zM1N2qGZQG7scKpaqR8YDuKA== X-Received: by 2002:a2e:b603:0:b0:25a:6dbc:c6f7 with SMTP id r3-20020a2eb603000000b0025a6dbcc6f7mr5870526ljn.300.1656321089250; Mon, 27 Jun 2022 02:11:29 -0700 (PDT) Received: from toster.office.semihalf.net ([83.142.187.84]) by smtp.gmail.com with ESMTPSA id q24-20020a056512211800b0047f615b5cbfsm1717756lfr.211.2022.06.27.02.11.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Jun 2022 02:11:28 -0700 (PDT) From: Stanislaw Kardach To: dpdk stable Cc: Stanislaw Kardach , Kevin Traynor , Bruce Richardson Subject: [PATCH 21.11] config: fix C++ cross compiler for Arm and PPC Date: Mon, 27 Jun 2022 11:11:19 +0200 Message-Id: <20220627091119.23098-1-kda@semihalf.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org [ upstream commit f75dd6d3b1215c2e7cdbdc290b5789517c8cfe10 ] Through some mixup all cross-files for ARM and PowerPC platforms were using C Preprocessor (cpp) instead of GCC (g++). This caused meson to fail detecting the C++ compiler presence and therefore disabling some targets (i.e. C++ include file checks). Fixes: e53a5299d219 ("build: support vendor specific ARM cross builds") Signed-off-by: Stanislaw Kardach Acked-by: Bruce Richardson --- config/arm/arm32_armv8_linux_gcc | 2 +- config/arm/arm64_armada_linux_gcc | 2 +- config/arm/arm64_armv8_linux_gcc | 2 +- config/arm/arm64_bluefield_linux_gcc | 2 +- config/arm/arm64_centriq2400_linux_gcc | 2 +- config/arm/arm64_cn10k_linux_gcc | 2 +- config/arm/arm64_dpaa_linux_gcc | 2 +- config/arm/arm64_emag_linux_gcc | 2 +- config/arm/arm64_graviton2_linux_gcc | 2 +- config/arm/arm64_kunpeng920_linux_gcc | 2 +- config/arm/arm64_kunpeng930_linux_gcc | 2 +- config/arm/arm64_n1sdp_linux_gcc | 2 +- config/arm/arm64_n2_linux_gcc | 2 +- config/arm/arm64_octeontx2_linux_gcc | 2 +- config/arm/arm64_stingray_linux_gcc | 2 +- config/arm/arm64_thunderx2_linux_gcc | 2 +- config/arm/arm64_thunderxt88_linux_gcc | 2 +- config/ppc/ppc64le-power8-linux-gcc | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/config/arm/arm32_armv8_linux_gcc b/config/arm/arm32_armv8_linux_gcc index 89f8a12881..0d4618ea4a 100644 --- a/config/arm/arm32_armv8_linux_gcc +++ b/config/arm/arm32_armv8_linux_gcc @@ -1,6 +1,6 @@ [binaries] c = 'arm-linux-gnueabihf-gcc' -cpp = 'arm-linux-gnueabihf-cpp' +cpp = 'arm-linux-gnueabihf-g++' ar = 'arm-linux-gnueabihf-gcc-ar' strip = 'arm-linux-gnueabihf-strip' pkgconfig = 'arm-linux-gnueabihf-pkg-config' diff --git a/config/arm/arm64_armada_linux_gcc b/config/arm/arm64_armada_linux_gcc index 301418949b..5043b82651 100644 --- a/config/arm/arm64_armada_linux_gcc +++ b/config/arm/arm64_armada_linux_gcc @@ -1,6 +1,6 @@ [binaries] c = 'aarch64-linux-gnu-gcc' -cpp = 'aarch64-linux-gnu-cpp' +cpp = 'aarch64-linux-gnu-g++' ar = 'aarch64-linux-gnu-ar' as = 'aarch64-linux-gnu-as' strip = 'aarch64-linux-gnu-strip' diff --git a/config/arm/arm64_armv8_linux_gcc b/config/arm/arm64_armv8_linux_gcc index 5391d35389..5c32f6b9ca 100644 --- a/config/arm/arm64_armv8_linux_gcc +++ b/config/arm/arm64_armv8_linux_gcc @@ -1,6 +1,6 @@ [binaries] c = 'aarch64-linux-gnu-gcc' -cpp = 'aarch64-linux-gnu-cpp' +cpp = 'aarch64-linux-gnu-g++' ar = 'aarch64-linux-gnu-gcc-ar' strip = 'aarch64-linux-gnu-strip' pkgconfig = 'aarch64-linux-gnu-pkg-config' diff --git a/config/arm/arm64_bluefield_linux_gcc b/config/arm/arm64_bluefield_linux_gcc index 248a9f031a..df6eccc046 100644 --- a/config/arm/arm64_bluefield_linux_gcc +++ b/config/arm/arm64_bluefield_linux_gcc @@ -1,6 +1,6 @@ [binaries] c = 'aarch64-linux-gnu-gcc' -cpp = 'aarch64-linux-gnu-cpp' +cpp = 'aarch64-linux-gnu-g++' ar = 'aarch64-linux-gnu-gcc-ar' strip = 'aarch64-linux-gnu-strip' pkgconfig = 'aarch64-linux-gnu-pkg-config' diff --git a/config/arm/arm64_centriq2400_linux_gcc b/config/arm/arm64_centriq2400_linux_gcc index dfe9110331..ddffc0503a 100644 --- a/config/arm/arm64_centriq2400_linux_gcc +++ b/config/arm/arm64_centriq2400_linux_gcc @@ -1,6 +1,6 @@ [binaries] c = 'aarch64-linux-gnu-gcc' -cpp = 'aarch64-linux-gnu-cpp' +cpp = 'aarch64-linux-gnu-g++' ar = 'aarch64-linux-gnu-gcc-ar' strip = 'aarch64-linux-gnu-strip' pkgconfig = 'aarch64-linux-gnu-pkg-config' diff --git a/config/arm/arm64_cn10k_linux_gcc b/config/arm/arm64_cn10k_linux_gcc index 88e5f10945..19068f0ec9 100644 --- a/config/arm/arm64_cn10k_linux_gcc +++ b/config/arm/arm64_cn10k_linux_gcc @@ -1,6 +1,6 @@ [binaries] c = 'aarch64-linux-gnu-gcc' -cpp = 'aarch64-linux-gnu-cpp' +cpp = 'aarch64-linux-gnu-g++' ar = 'aarch64-linux-gnu-gcc-ar' strip = 'aarch64-linux-gnu-strip' pkgconfig = 'aarch64-linux-gnu-pkg-config' diff --git a/config/arm/arm64_dpaa_linux_gcc b/config/arm/arm64_dpaa_linux_gcc index e9d5fd31fc..70df99fb02 100644 --- a/config/arm/arm64_dpaa_linux_gcc +++ b/config/arm/arm64_dpaa_linux_gcc @@ -1,6 +1,6 @@ [binaries] c = 'aarch64-linux-gnu-gcc' -cpp = 'aarch64-linux-gnu-cpp' +cpp = 'aarch64-linux-gnu-g++' ar = 'aarch64-linux-gnu-ar' as = 'aarch64-linux-gnu-as' strip = 'aarch64-linux-gnu-strip' diff --git a/config/arm/arm64_emag_linux_gcc b/config/arm/arm64_emag_linux_gcc index 9cdd931180..06f5eaecd0 100644 --- a/config/arm/arm64_emag_linux_gcc +++ b/config/arm/arm64_emag_linux_gcc @@ -1,6 +1,6 @@ [binaries] c = 'aarch64-linux-gnu-gcc' -cpp = 'aarch64-linux-gnu-cpp' +cpp = 'aarch64-linux-gnu-g++' ar = 'aarch64-linux-gnu-gcc-ar' strip = 'aarch64-linux-gnu-strip' pkgconfig = 'aarch64-linux-gnu-pkg-config' diff --git a/config/arm/arm64_graviton2_linux_gcc b/config/arm/arm64_graviton2_linux_gcc index 8016fd236c..24b2dbcca8 100644 --- a/config/arm/arm64_graviton2_linux_gcc +++ b/config/arm/arm64_graviton2_linux_gcc @@ -1,6 +1,6 @@ [binaries] c = 'aarch64-linux-gnu-gcc' -cpp = 'aarch64-linux-gnu-cpp' +cpp = 'aarch64-linux-gnu-g++' ar = 'aarch64-linux-gnu-gcc-ar' strip = 'aarch64-linux-gnu-strip' pkgconfig = 'aarch64-linux-gnu-pkg-config' diff --git a/config/arm/arm64_kunpeng920_linux_gcc b/config/arm/arm64_kunpeng920_linux_gcc index c4685b2458..4a71531e3e 100644 --- a/config/arm/arm64_kunpeng920_linux_gcc +++ b/config/arm/arm64_kunpeng920_linux_gcc @@ -1,6 +1,6 @@ [binaries] c = 'aarch64-linux-gnu-gcc' -cpp = 'aarch64-linux-gnu-cpp' +cpp = 'aarch64-linux-gnu-g++' ar = 'aarch64-linux-gnu-gcc-ar' strip = 'aarch64-linux-gnu-strip' pkgconfig = 'aarch64-linux-gnu-pkg-config' diff --git a/config/arm/arm64_kunpeng930_linux_gcc b/config/arm/arm64_kunpeng930_linux_gcc index fb85d2d710..383f0b0313 100644 --- a/config/arm/arm64_kunpeng930_linux_gcc +++ b/config/arm/arm64_kunpeng930_linux_gcc @@ -1,6 +1,6 @@ [binaries] c = 'aarch64-linux-gnu-gcc' -cpp = 'aarch64-linux-gnu-cpp' +cpp = 'aarch64-linux-gnu-g++' ar = 'aarch64-linux-gnu-gcc-ar' strip = 'aarch64-linux-gnu-strip' pkgconfig = 'aarch64-linux-gnu-pkg-config' diff --git a/config/arm/arm64_n1sdp_linux_gcc b/config/arm/arm64_n1sdp_linux_gcc index 0df283e2f4..5f6356caa2 100644 --- a/config/arm/arm64_n1sdp_linux_gcc +++ b/config/arm/arm64_n1sdp_linux_gcc @@ -1,6 +1,6 @@ [binaries] c = 'aarch64-linux-gnu-gcc' -cpp = 'aarch64-linux-gnu-cpp' +cpp = 'aarch64-linux-gnu-g++' ar = 'aarch64-linux-gnu-gcc-ar' strip = 'aarch64-linux-gnu-strip' pkgconfig = 'aarch64-linux-gnu-pkg-config' diff --git a/config/arm/arm64_n2_linux_gcc b/config/arm/arm64_n2_linux_gcc index 036aee2b0a..82806ba780 100644 --- a/config/arm/arm64_n2_linux_gcc +++ b/config/arm/arm64_n2_linux_gcc @@ -1,6 +1,6 @@ [binaries] c = 'aarch64-linux-gnu-gcc' -cpp = 'aarch64-linux-gnu-cpp' +cpp = 'aarch64-linux-gnu-g++' ar = 'aarch64-linux-gnu-gcc-ar' strip = 'aarch64-linux-gnu-strip' pkgconfig = 'aarch64-linux-gnu-pkg-config' diff --git a/config/arm/arm64_octeontx2_linux_gcc b/config/arm/arm64_octeontx2_linux_gcc index 8fbdd3868d..d23b6527ef 100644 --- a/config/arm/arm64_octeontx2_linux_gcc +++ b/config/arm/arm64_octeontx2_linux_gcc @@ -1,6 +1,6 @@ [binaries] c = 'aarch64-linux-gnu-gcc' -cpp = 'aarch64-linux-gnu-cpp' +cpp = 'aarch64-linux-gnu-g++' ar = 'aarch64-linux-gnu-gcc-ar' strip = 'aarch64-linux-gnu-strip' pkgconfig = 'aarch64-linux-gnu-pkg-config' diff --git a/config/arm/arm64_stingray_linux_gcc b/config/arm/arm64_stingray_linux_gcc index 319a4a151d..cf98337f0f 100644 --- a/config/arm/arm64_stingray_linux_gcc +++ b/config/arm/arm64_stingray_linux_gcc @@ -1,6 +1,6 @@ [binaries] c = 'aarch64-linux-gnu-gcc' -cpp = 'aarch64-linux-gnu-cpp' +cpp = 'aarch64-linux-gnu-g++' ar = 'aarch64-linux-gnu-gcc-ar' strip = 'aarch64-linux-gnu-strip' pkgconfig = 'aarch64-linux-gnu-pkg-config' diff --git a/config/arm/arm64_thunderx2_linux_gcc b/config/arm/arm64_thunderx2_linux_gcc index 69c71cbc82..616f6c263a 100644 --- a/config/arm/arm64_thunderx2_linux_gcc +++ b/config/arm/arm64_thunderx2_linux_gcc @@ -1,6 +1,6 @@ [binaries] c = 'aarch64-linux-gnu-gcc' -cpp = 'aarch64-linux-gnu-cpp' +cpp = 'aarch64-linux-gnu-g++' ar = 'aarch64-linux-gnu-gcc-ar' strip = 'aarch64-linux-gnu-strip' pkgconfig = 'aarch64-linux-gnu-pkg-config' diff --git a/config/arm/arm64_thunderxt88_linux_gcc b/config/arm/arm64_thunderxt88_linux_gcc index 372097ba01..131f56465a 100644 --- a/config/arm/arm64_thunderxt88_linux_gcc +++ b/config/arm/arm64_thunderxt88_linux_gcc @@ -1,6 +1,6 @@ [binaries] c = 'aarch64-linux-gnu-gcc' -cpp = 'aarch64-linux-gnu-cpp' +cpp = 'aarch64-linux-gnu-g++' ar = 'aarch64-linux-gnu-gcc-ar' strip = 'aarch64-linux-gnu-strip' pkgconfig = 'aarch64-linux-gnu-pkg-config' diff --git a/config/ppc/ppc64le-power8-linux-gcc b/config/ppc/ppc64le-power8-linux-gcc index 51f7ceebf3..784c33df9e 100644 --- a/config/ppc/ppc64le-power8-linux-gcc +++ b/config/ppc/ppc64le-power8-linux-gcc @@ -1,6 +1,6 @@ [binaries] c = 'powerpc64le-linux-gcc' -cpp = 'powerpc64le-linux-cpp' +cpp = 'powerpc64le-linux-g++' ar = 'powerpc64le-linux-gcc-ar' strip = 'powerpc64le-linux-strip' -- 2.30.2