package/pkg-meson.mk: Fix cross-compilation.conf
PATCH 1/1 package/pkg-meson.mk: Fix cross-compilation.conf
$$(STAGING_DIR) -> $(STAGING_DIR) in PKG_MESON_INSTALL_CROSS_CONF.
$$ resulted in $(STAGING_DIR) in the file instead of the expanded value.
--- package/pkg-meson.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
package/pkg-meson.mk +1 -1
@@ -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' \
Signature · 1 line
2.20.1
PATCH 1/1 package/pkg-meson.mk: Fix cross-compilation.conf
Hello Gleb,
thanks for the patch, only one nitpick below...
Quoted 4 lines · Gleb Mazovetskiy
$$(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
Regards,
Peter
Quoted 19 lines
Signed-off-by Gleb Mazovetskiy <[email protected]>--- package/pkg-meson.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)package/pkg-meson.mk +1
-1@@ -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' \
PATCH 1/1 package/pkg-meson.mk: Fix cross-compilation.conf
In reply to Gleb Mazovetskiy$$(STAGING_DIR) -> $(STAGING_DIR) in PKG_MESON_INSTALL_CROSS_CONF.
$$ resulted in $(STAGING_DIR) in the file instead of the expanded value.
Note that this change only affects the etc config at:host/etc/meson/cross-compilation.conf
Per-package cross-compilation.conf files are already correct.
--- package/pkg-meson.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
package/pkg-meson.mk +1 -1
@@ -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' \
Signature · 1 line
2.20.1
PATCH 1/1 package/pkg-meson.mk: Fix cross-compilation.conf
I've sent the updated patch using the following command but it appeared as an independent patch in patchwork:
git send-email --to buildroot at buildroot.org --cc "Eric Le Bihan < [email protected]>" outgoing/0001-package-pkg-meson.mk-Fix-cross-compilation.conf.patch *--in-reply-to
20200311105930.21564-1-glex.spb at gmail.com <[email protected]>*
What am I doing wrong?
Quoted 31 lines · Gleb Mazovetskiy
$$(STAGING_DIR) -> $(STAGING_DIR) in
PKG_MESON_INSTALL_CROSS_CONF.$$ resulted in
$(STAGING_DIR)in the file instead of the expanded value.Note that this change only affects the etc config at:
host/etc/meson/cross-compilation.confPer-package cross-compilation.conf files are already correct.
Reviewed-by Peter Seiderer <[email protected]>Signed-off-by Gleb Mazovetskiy <[email protected]>--- package/pkg-meson.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)package/pkg-meson.mk +1
-1@@ -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' \
Quoted 4 lines
--
2.20.1
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20200311/0f21c8c1/attachment.html>
PATCH 1/1 package/pkg-meson.mk: Fix cross-compilation.conf
Gleb, All,
On 2020-03-11 19:15 +0000, Gleb Mazovetskiy spake thusly:
Quoted 4 lines
I've sent the updated patch using the following command but it appeared as an independent patch in patchwork:
git send-email --to [1]buildroot at buildroot.org --cc "Eric Le Bihan < [2][email protected]>"outgoing/0001-package-pkg-meson.mk-Fix-cross-compilation.conf.patch--in-reply-to [3]20200311105930.21564-1-glex.spb at gmail.com What am I doing wrong?
Nothing wrong, that's expected: new iterations do not automatically mark the older ones as superseded.
Regards,
Yann E. MORIN.
Quoted 54 lines · Gleb Mazovetskiy
$$(STAGING_DIR) -> $(STAGING_DIR) in PKG_MESON_INSTALL_CROSS_CONF. $$ resulted in `$(STAGING_DIR)` in the file instead of the expanded value.Note that this change only affects the etc config at:
host/etc/meson/cross-compilation.confPer-package cross-compilation.conf files are already correct.
Reviewed-by Peter Seiderer < [5][email protected]>Signed-off-by Gleb Mazovetskiy < [6][email protected]>---
?package/ [7]pkg-meson.mk | 2 +-?1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package/ [8]pkg-meson.mk b/package/ [9]pkg-meson.mk index 642b715938..416129f6fe 100644 --- a/package/ [10]pkg-meson.mk +++ b/package/ [11]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)/ [12]cross-compilation.conf.in \ ? ? ? ? ? ? > $(HOST_DIR)/etc/meson/ [13]cross-compilation.conf.in ? ? ? ? sed -e 's%@PKG_TARGET_CFLAGS@%%g' \ -- 2.20.1Links:
1. mailto:buildroot at buildroot.org
2. mailto:eric.le.bihan.dev at free.fr
3. mailto:20200311105930.21564-1-glex.spb at gmail.com
4. mailto:glex.spb at gmail.com
5. mailto:ps.report at gmx.net
6. mailto:glex.spb at gmail.com
7. http://pkg-meson.mk
8. http://pkg-meson.mk
9. http://pkg-meson.mk
10. http://pkg-meson.mk
11. http://pkg-meson.mk
12. http://cross-compilation.conf.in
13. http://cross-compilation.conf.in_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------'
Yann E. MORIN
AppliedPATCH 1/1 package/pkg-meson.mk: Fix cross-compilation.conf
In reply to Gleb MazovetskiyGleb, All,
On 2020-03-11 19:11 +0000, Gleb Mazovetskiy spake thusly:
Quoted 5 lines
$$(STAGING_DIR) -> $(STAGING_DIR) in
PKG_MESON_INSTALL_CROSS_CONF.$$ resulted in
$(STAGING_DIR)in the file instead of the expanded value.
Quoted 7 lines
Note that this change only affects the etc config at:
host/etc/meson/cross-compilation.confPer-package cross-compilation.conf files are already correct.
Reviewed-by Peter Seiderer <[email protected]>Signed-off-by Gleb Mazovetskiy <[email protected]>
Applied to master, thanks.
Regards,
Yann E. MORIN.
Quoted 24 lines
--- package/pkg-meson.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)package/pkg-meson.mk +1
-1@@ -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' \Signature · 6 lines
2.20.1 _______________________________________________ buildroot mailing list buildroot at busybox.net http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------'
PATCH 1/1 package/pkg-meson.mk: Fix cross-compilation.conf
In reply to Gleb MazovetskiyQuoted 6 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Gleb" == Gleb Mazovetskiy <[email protected]> writes:
$$(STAGING_DIR) -> $(STAGING_DIR) in
PKG_MESON_INSTALL_CROSS_CONF. $$ resulted in$(STAGING_DIR)in the file instead of the expanded value.
Quoted 7 lines
Note that this change only affects the etc config at:
host/etc/meson/cross-compilation.confPer-package cross-compilation.conf files are already correct.
Reviewed-by Peter Seiderer <[email protected]>Signed-off-by Gleb Mazovetskiy <[email protected]>
Committed to 2020.02.x, thanks.
Signature · 1 line
Bye, Peter Korsgaard
PATCH 1/1 package/pkg-meson.mk: Fix cross-compilation.conf
In reply to Gleb Mazovetskiy$$(STAGING_DIR) -> $(STAGING_DIR) in PKG_MESON_INSTALL_CROSS_CONF.
$$ resulted in $(STAGING_DIR) in the file instead of the expanded value.
Note that this change only affects the etc config at:host/etc/meson/cross-compilation.conf
Per-package cross-compilation.conf files are already correct.
--- package/pkg-meson.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
package/pkg-meson.mk +1 -1
@@ -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' \
Signature · 1 line
2.20.1