From mboxrd@z Thu Jan 1 00:00:00 1970 From: Peter Seiderer Date: Wed, 11 Mar 2020 19:44:05 +0100 Subject: [Buildroot] [PATCH 1/1] package/pkg-meson.mk: Fix cross-compilation.conf In-Reply-To: <20200311105930.21564-1-glex.spb@gmail.com> References: <20200311105930.21564-1-glex.spb@gmail.com> Message-ID: <20200311194405.066b502f@gmx.net> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: buildroot@busybox.net Hello Gleb, thanks for the patch, only one nitpick below... On Wed, 11 Mar 2020 10:59:30 +0000, Gleb Mazovetskiy wrote: > $$(STAGING_DIR) -> $(STAGING_DIR) in PKG_MESON_INSTALL_CROSS_CONF. > > $$ resulted in `$(STAGING_DIR)` in the file instead of the expanded > value. Please mention that the affected file is the 'host/etc/meson/cross-compilation.conf' one (and not the per-package ones)... With this fixed you can add my Reviewed-by: Peter Seiderer Regards, Peter > > Signed-off-by: Gleb Mazovetskiy > --- > 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 642b715938..416129f6fe 100644 > --- a/package/pkg-meson.mk > +++ b/package/pkg-meson.mk > @@ -193,7 +193,7 @@ define PKG_MESON_INSTALL_CROSS_CONF > -e 's%@TARGET_LDFLAGS@%$(call make-comma-list,$(TARGET_LDFLAGS))@PKG_TARGET_CFLAGS@%g' \ > -e 's%@TARGET_CXXFLAGS@%$(call make-comma-list,$(TARGET_CXXFLAGS))@PKG_TARGET_CFLAGS@%g' \ > -e 's%@HOST_DIR@%$(HOST_DIR)%g' \ > - -e 's%@STAGING_DIR@%$$(STAGING_DIR)%g' \ > + -e 's%@STAGING_DIR@%$(STAGING_DIR)%g' \ > $(HOST_MESON_PKGDIR)/cross-compilation.conf.in \ > > $(HOST_DIR)/etc/meson/cross-compilation.conf.in > sed -e 's%@PKG_TARGET_CFLAGS@%%g' \