From patchwork Mon Apr 8 20:43:20 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Seiderer X-Patchwork-Id: 1081486 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.137; helo=fraxinus.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=gmx.net Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; secure) header.d=gmx.net header.i=@gmx.net header.b="KYDs6JOc"; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44dMnw4lHJz9sRC for ; Tue, 9 Apr 2019 06:43:32 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id BE7C784DD5; Mon, 8 Apr 2019 20:43:29 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Yef0aOk49xxO; Mon, 8 Apr 2019 20:43:29 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 0B9CC84DFF; Mon, 8 Apr 2019 20:43:29 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id C12271BF20D for ; Mon, 8 Apr 2019 20:43:27 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id BE66584DFF for ; Mon, 8 Apr 2019 20:43:27 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id lR1NKSbCGdml for ; Mon, 8 Apr 2019 20:43:26 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mout.gmx.net (mout.gmx.net [212.227.15.18]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 0260D84D3A for ; Mon, 8 Apr 2019 20:43:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1554756202; bh=p65FtxrrQ7OW2tRfHOTTrSeNttSjS8iLYhJ2b+t3nuU=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date; b=KYDs6JOcjJ5GVzV+col8Gwp7zYGnX2eqlQPaSTt4HFiwmSOeELKRZmuDWIietpZI1 luGkQVHu2x/NWIeRCg5VlUukuMeUw7gOIDUM2m7W1iB/rN5/Gr37Rbz2Fa9sJNI32F h9GaO3bjkOrWywgxPSlyKYtOP7Dvd9xF0tOtD7Rc= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.localdomain ([92.75.36.130]) by mail.gmx.com (mrgmx002 [212.227.17.190]) with ESMTPSA (Nemesis) id 0MQR3s-1hLLNu1xV6-00Tk0N; Mon, 08 Apr 2019 22:43:22 +0200 From: Peter Seiderer To: buildroot@buildroot.org Date: Mon, 8 Apr 2019 22:43:20 +0200 Message-Id: <20190408204321.18620-1-ps.report@gmx.net> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 X-Provags-ID: V03:K1:vURTUCaxHHZhcxI/l4O7gVEv1Ot9B42kf5/yahML7Q8XWRsDC7g ZRnw+c1sqtIM+VECvUwcf7r5AwFryBh39bsd5JCN/5TECol6rQWp8AeODdiHpn58OVpVvm5 YyKDlBWaNM2Dc1abN0jo4NNfOSXcCYEghYrsZnCcAD193g8+46XDepaD8y/mjBNOhPIta+a CmtDZSKRmSah0XDoR9qkQ== X-UI-Out-Filterresults: notjunk:1; V03:K0:v7Xs40axoSU=:PdO0bNum0NKyeRIwfPHC/g 80MD67csl7hax1X8kB/GKzmLQ0gGNtYWVHSB8+hZNWZgarYf6n5TncqwK4FFh4epjmKXATB2L mZ+1YpWndkS6wIORYGHNqoWWFzE0VsRnAnRFZJq+5e109Uw/zjvNUDyLuRuGOChW47xDD5hm1 Evv2Dqlf0cQfZiI5NgB+lSC0oBjg4VjOvxIIIG/4JFnS3Es1AwBATxwzO7Tmst4rcBPCDv3GG MChRMdcPYNdh4Cd9rqCR9sqqZslU9Adw0yelMARkLDCWobfZZvU/myc5DNIQf1IbBwDsJT29Z EH4K74QskrxpYbJTmRvJDDAcle5cfkCGLFsPOwdJ3edR9JE0pFKYJcN+XEygSVaLs/s22QOjF 7vjIeLHeZMA3ErcJm2gumK2BfZI/QubYsfKeVlV6KzM755gMygFKAH1367DtA0LGQFXF/l17J b9U74LSjGbcttUvnXL54XKPWHsJe1cpj94k8q8+FiS44/wUBU5ZgW95Pd4G2PmXHMFC/D8c+X W5SsGhEsHikrsHNZLjlp0B+IDxSfU90inMzxcxFOimb/MRyTANyIKuFRAo/cf2LrvNydunFSi yDiR0xXKuTv0Ym2YI0T0ZNQkVOUNI7pXXZOP659/tc0jH9LNUM/qUGmrw+fKdpvZfqcRXRDrj qyY24etiSxjHgNK/pR2KsTmyGbolEiR5QBN3Ud25v7iIzjJ02atZwYziYT4RIX2yiNEfuq+V9 7eLgxkQLpEtZMjmZ6wlRT5EtLICffHZgD4E0H5HbPraRUQYDrslyEeaM3YUuauRObESZZ9/CT pxTFL3FquOGLo2EpfonmXGIjhsYhPwDpnu2lOIMFkA1OwfXWVDNfVtNkWrAFJMqcdfUpQmFDk ASCUsI3PkcHqqZVm6y4IgDsuOpJgaCS98U0Y8cPmvuVifDAF0uQ5TzXPqANI9F Subject: [Buildroot] [PATCH v5 1/2] meson: add per package optional compiler/linker flags X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Bernd Kuhls , Eric Le Bihan Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Add LIBFOO_MESON_CFLAGS, LIBFOO_MESON_LDFLAGS and LIBFOO_MESON_CXXFLAGS variables to allow per package additional compiler/linker flags. Signed-off-by: Peter Seiderer --- Notes: - documentation change for the new flags variables is missing Changes v4: - new patch (base on the original '[RFC v3 2/4] meson: change from global to per package cross-compilation.conf', see [1]) Changes v4 -> v5: - no changes [1] http://lists.busybox.net/pipermail/buildroot/2018-July/226313.html --- package/meson/cross-compilation.conf.in | 8 ++++---- package/meson/meson.mk | 3 +++ package/pkg-meson.mk | 7 +++++++ 3 files changed, 14 insertions(+), 4 deletions(-) -- 2.21.0 diff --git a/package/meson/cross-compilation.conf.in b/package/meson/cross-compilation.conf.in index fc8e27f7eb..4056c2b2f4 100644 --- a/package/meson/cross-compilation.conf.in +++ b/package/meson/cross-compilation.conf.in @@ -12,10 +12,10 @@ pkgconfig = '@HOST_DIR@/usr/bin/pkg-config' [properties] needs_exe_wrapper = true -c_args = [@TARGET_CFLAGS@] -c_link_args = [@TARGET_LDFLAGS@] -cpp_args = [@TARGET_CXXFLAGS@] -cpp_link_args = [@TARGET_LDFLAGS@] +c_args = [@TARGET_CFLAGS@@PKG_TARGET_CFLAGS@] +c_link_args = [@TARGET_LDFLAGS@@PKG_TARGET_LDFLAGS@] +cpp_args = [@TARGET_CXXFLAGS@@PKG_TARGET_CXXFLAGS@] +cpp_link_args = [@TARGET_LDFLAGS@@PKG_TARGET_LDFLAGS@] [host_machine] system = 'linux' diff --git a/package/meson/meson.mk b/package/meson/meson.mk index 49e27f5527..70128f6bad 100644 --- a/package/meson/meson.mk +++ b/package/meson/meson.mk @@ -60,6 +60,9 @@ define HOST_MESON_INSTALL_CROSS_CONF -e "s%@TARGET_CFLAGS@%$(HOST_MESON_SED_CFLAGS)%g" \ -e "s%@TARGET_LDFLAGS@%$(HOST_MESON_SED_LDFLAGS)%g" \ -e "s%@TARGET_CXXFLAGS@%$(HOST_MESON_SED_CXXFLAGS)%g" \ + -e "s%@PKG_TARGET_CFLAGS@%%g" \ + -e "s%@PKG_TARGET_LDFLAGS@%%g" \ + -e "s%@PKG_TARGET_CXXFLAGS@%%g" \ -e "s%@HOST_DIR@%$(HOST_DIR)%g" \ $(HOST_MESON_PKGDIR)/cross-compilation.conf.in \ > $(HOST_DIR)/etc/meson/cross-compilation.conf diff --git a/package/pkg-meson.mk b/package/pkg-meson.mk index 886fcf7205..9974b1e513 100644 --- a/package/pkg-meson.mk +++ b/package/pkg-meson.mk @@ -57,6 +57,10 @@ $(2)_NINJA_ENV ?= ifndef $(2)_CONFIGURE_CMDS ifeq ($(4),target) +$(2)_MESON_SED_CFLAGS = $(if $($(2)_MESON_CFLAGS),`printf '"%s"$(comma) ' $($(2)_MESON_CFLAGS)`) +$(2)_MESON_SED_LDFLAGS = $(if $($(2)_MESON_LDFLAGS),`printf '"%s"$(comma) ' $($(2)_MESON_LDFLAGS)`) +$(2)_MESON_SED_CXXFLAGS = $(if $($(2)_MESON_CXXFLAGS),`printf '"%s"$(comma) ' $$($$(2)_MESON_CXXFLAGS)`) + # Configure package for target # # @@ -70,6 +74,9 @@ define $(2)_CONFIGURE_CMDS -e "s%@TARGET_CFLAGS@%$$(HOST_MESON_SED_CFLAGS)%g" \ -e "s%@TARGET_LDFLAGS@%$$(HOST_MESON_SED_LDFLAGS)%g" \ -e "s%@TARGET_CXXFLAGS@%$$(HOST_MESON_SED_CXXFLAGS)%g" \ + -e "s%@PKG_TARGET_CFLAGS@%$$($$(PKG)_MESON_SED_CFLAGS)%g" \ + -e "s%@PKG_TARGET_LDFLAGS@%$$($$(PKG)_MESON_SED_LDFLAGS)%g" \ + -e "s%@PKG_TARGET_CXXFLAGS@%$$($$(PKG)_MESON_SED_CXXFLAGS)%g" \ -e "s%@HOST_DIR@%$$(HOST_DIR)%g" \ package/meson/cross-compilation.conf.in \ > $$($$(PKG)_SRCDIR)/build/cross-compilation.conf