From mboxrd@z Thu Jan 1 00:00:00 1970 From: Peter Seiderer Date: Mon, 25 Feb 2019 20:35:01 +0100 Subject: [Buildroot] [PATCH 1/1] package/pkg-meson: fix meson cpu_family format In-Reply-To: <20190225005245.1954-1-james.hilliard1@gmail.com> References: <20190225005245.1954-1-james.hilliard1@gmail.com> Message-ID: <20190225203501.3af08ef8@gmx.net> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: buildroot@busybox.net Hello James, On Mon, 25 Feb 2019 08:52:45 +0800, james.hilliard1 at gmail.com wrote: > From: James Hilliard > > meson requires a custom cpu_family format > https://mesonbuild.com/Reference-tables.html#cpu-families > > Signed-off-by: James Hilliard > --- > package/pkg-meson.mk | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/package/pkg-meson.mk b/package/pkg-meson.mk > index a637299476..886fcf7205 100644 > --- a/package/pkg-meson.mk > +++ b/package/pkg-meson.mk > @@ -64,7 +64,7 @@ define $(2)_CONFIGURE_CMDS > rm -rf $$($$(PKG)_SRCDIR)/build > mkdir -p $$($$(PKG)_SRCDIR)/build > sed -e "s%@TARGET_CROSS@%$$(TARGET_CROSS)%g" \ > - -e "s%@TARGET_ARCH@%$$(ARCH)%g" \ > + -e "s%@TARGET_ARCH@%$$(HOST_MESON_TARGET_CPU_FAMILY)%g" \ > -e "s%@TARGET_CPU@%$$(GCC_TARGET_CPU)%g" \ > -e "s%@TARGET_ENDIAN@%$$(call LOWERCASE,$$(BR2_ENDIAN))%g" \ > -e "s%@TARGET_CFLAGS@%$$(HOST_MESON_SED_CFLAGS)%g" \ Doing the same for package/pgk-meson.mk as commit 'package/meson: fix CPU familly' ([1]) does for package/meson/meson.mk (and by overlapping timing this change got lost for the 'package/pkg-meson: support per-package directories' ([2]) patch)... Reviewed-by: Peter Seiderer Regards, Peter [1] https://git.buildroot.net/buildroot/commit/?id=f3bacda0c0e0adb2ac7f515476f6bb83d1385130 [2] https://git.buildroot.net/buildroot/commit/?id=5d882b71a8c0c87b0ccdea7ad620a8f44c33fcb1