* [Buildroot] [PATCHv2] package/meson: fix malformed cross-compilation.conf.in
@ 2017-12-30 9:56 Yann E. MORIN
2017-12-31 21:04 ` Adam Duskett
2018-01-01 22:05 ` Thomas Petazzoni
0 siblings, 2 replies; 5+ messages in thread
From: Yann E. MORIN @ 2017-12-30 9:56 UTC (permalink / raw)
To: buildroot
Currently, meson will set the c_link_args and the cpp_link_args to the
value of TARGET_LDFLAGS, even when it's not defined.
This creates a malformed array ["",] which will break any package
building using meson/ninja.
We fix that by using an empty replacement when the corresponding values
are empty.
Reported-by: Adam Duskett <Adamduskett@outlook.com>
Signed-off-by: Adam Duskett <Adamduskett@outlook.com>
[yann.morin.1998 at free.fr: alternate implementation, suggested by Thomas]
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
package/meson/meson.mk | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/package/meson/meson.mk b/package/meson/meson.mk
index 55ce84da07..d55c3c7c00 100644
--- a/package/meson/meson.mk
+++ b/package/meson/meson.mk
@@ -16,15 +16,19 @@ HOST_MESON_NEEDS_HOST_PYTHON = python3
HOST_MESON_TARGET_ENDIAN = $(call LOWERCASE,$(BR2_ENDIAN))
HOST_MESON_TARGET_CPU = $(call qstrip,$(BR2_GCC_TARGET_CPU))
+HOST_MESON_SED_CFLAGS = $(if $(TARGET_CFLAGS),`printf '"%s"$(comma) ' $(TARGET_CFLAGS)`)
+HOST_MESON_SED_LDFLAGS = $(if $(TARGET_LDFLAGS),`printf '"%s"$(comma) ' $(TARGET_LDFLAGS)`)
+HOST_MESON_SED_CXXFLAGS = $(if $(TARGET_CXXFLAGS),`printf '"%s"$(comma) ' $(TARGET_CXXFLAGS)`)
+
define HOST_MESON_INSTALL_CROSS_CONF
mkdir -p $(HOST_DIR)/etc/meson
sed -e "s%@TARGET_CROSS@%$(TARGET_CROSS)%g" \
-e "s%@TARGET_ARCH@%$(ARCH)%g" \
-e "s%@TARGET_CPU@%$(HOST_MESON_TARGET_CPU)%g" \
-e "s%@TARGET_ENDIAN@%$(HOST_MESON_TARGET_ENDIAN)%g" \
- -e "s%@TARGET_CFLAGS@%`printf '"%s", ' $(TARGET_CFLAGS)`%g" \
- -e "s%@TARGET_LDFLAGS@%`printf '"%s", ' $(TARGET_LDFLAGS)`%g" \
- -e "s%@TARGET_CXXFLAGS@%`printf '"%s", ' $(TARGET_CXXFLAGS)`%g" \
+ -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%@HOST_DIR@%$(HOST_DIR)%g" \
$(HOST_MESON_PKGDIR)/cross-compilation.conf.in \
> $(HOST_DIR)/etc/meson/cross-compilation.conf
--
2.11.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [Buildroot] [PATCHv2] package/meson: fix malformed cross-compilation.conf.in
2017-12-30 9:56 [Buildroot] [PATCHv2] package/meson: fix malformed cross-compilation.conf.in Yann E. MORIN
@ 2017-12-31 21:04 ` Adam Duskett
2018-01-01 13:02 ` Yann E. MORIN
2018-01-01 22:05 ` Thomas Petazzoni
1 sibling, 1 reply; 5+ messages in thread
From: Adam Duskett @ 2017-12-31 21:04 UTC (permalink / raw)
To: buildroot
All;
On Sat, Dec 30, 2017 at 4:56 AM, Yann E. MORIN <yann.morin.1998@free.fr> wrote:
> Currently, meson will set the c_link_args and the cpp_link_args to the
> value of TARGET_LDFLAGS, even when it's not defined.
>
> This creates a malformed array ["",] which will break any package
> building using meson/ninja.
>
> We fix that by using an empty replacement when the corresponding values
> are empty.
>
> Reported-by: Adam Duskett <Adamduskett@outlook.com>
> Signed-off-by: Adam Duskett <Adamduskett@outlook.com>
> [yann.morin.1998 at free.fr: alternate implementation, suggested by Thomas]
> Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
> Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
> ---
> package/meson/meson.mk | 10 +++++++---
> 1 file changed, 7 insertions(+), 3 deletions(-)
>
> diff --git a/package/meson/meson.mk b/package/meson/meson.mk
> index 55ce84da07..d55c3c7c00 100644
> --- a/package/meson/meson.mk
> +++ b/package/meson/meson.mk
> @@ -16,15 +16,19 @@ HOST_MESON_NEEDS_HOST_PYTHON = python3
> HOST_MESON_TARGET_ENDIAN = $(call LOWERCASE,$(BR2_ENDIAN))
> HOST_MESON_TARGET_CPU = $(call qstrip,$(BR2_GCC_TARGET_CPU))
>
> +HOST_MESON_SED_CFLAGS = $(if $(TARGET_CFLAGS),`printf '"%s"$(comma) ' $(TARGET_CFLAGS)`)
> +HOST_MESON_SED_LDFLAGS = $(if $(TARGET_LDFLAGS),`printf '"%s"$(comma) ' $(TARGET_LDFLAGS)`)
> +HOST_MESON_SED_CXXFLAGS = $(if $(TARGET_CXXFLAGS),`printf '"%s"$(comma) ' $(TARGET_CXXFLAGS)`)
> +
> define HOST_MESON_INSTALL_CROSS_CONF
> mkdir -p $(HOST_DIR)/etc/meson
> sed -e "s%@TARGET_CROSS@%$(TARGET_CROSS)%g" \
> -e "s%@TARGET_ARCH@%$(ARCH)%g" \
> -e "s%@TARGET_CPU@%$(HOST_MESON_TARGET_CPU)%g" \
> -e "s%@TARGET_ENDIAN@%$(HOST_MESON_TARGET_ENDIAN)%g" \
> - -e "s%@TARGET_CFLAGS@%`printf '"%s", ' $(TARGET_CFLAGS)`%g" \
> - -e "s%@TARGET_LDFLAGS@%`printf '"%s", ' $(TARGET_LDFLAGS)`%g" \
> - -e "s%@TARGET_CXXFLAGS@%`printf '"%s", ' $(TARGET_CXXFLAGS)`%g" \
> + -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%@HOST_DIR@%$(HOST_DIR)%g" \
> $(HOST_MESON_PKGDIR)/cross-compilation.conf.in \
> > $(HOST_DIR)/etc/meson/cross-compilation.conf
> --
> 2.11.0
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
Tested and works well. This needs to be pushed before I can send a
systemd patch.
^ permalink raw reply [flat|nested] 5+ messages in thread
* [Buildroot] [PATCHv2] package/meson: fix malformed cross-compilation.conf.in
2017-12-31 21:04 ` Adam Duskett
@ 2018-01-01 13:02 ` Yann E. MORIN
2018-01-01 15:17 ` Adam Duskett
0 siblings, 1 reply; 5+ messages in thread
From: Yann E. MORIN @ 2018-01-01 13:02 UTC (permalink / raw)
To: buildroot
Adam, All,
On 2017-12-31 16:04 -0500, Adam Duskett spake thusly:
> On Sat, Dec 30, 2017 at 4:56 AM, Yann E. MORIN <yann.morin.1998@free.fr> wrote:
> > Currently, meson will set the c_link_args and the cpp_link_args to the
> > value of TARGET_LDFLAGS, even when it's not defined.
> >
> > This creates a malformed array ["",] which will break any package
> > building using meson/ninja.
> >
> > We fix that by using an empty replacement when the corresponding values
> > are empty.
> >
> > Reported-by: Adam Duskett <Adamduskett@outlook.com>
> > Signed-off-by: Adam Duskett <Adamduskett@outlook.com>
> > [yann.morin.1998 at free.fr: alternate implementation, suggested by Thomas]
> > Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
> > Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
> > ---
> > package/meson/meson.mk | 10 +++++++---
> > 1 file changed, 7 insertions(+), 3 deletions(-)
> >
> > diff --git a/package/meson/meson.mk b/package/meson/meson.mk
> > index 55ce84da07..d55c3c7c00 100644
> > --- a/package/meson/meson.mk
> > +++ b/package/meson/meson.mk
> > @@ -16,15 +16,19 @@ HOST_MESON_NEEDS_HOST_PYTHON = python3
> > HOST_MESON_TARGET_ENDIAN = $(call LOWERCASE,$(BR2_ENDIAN))
> > HOST_MESON_TARGET_CPU = $(call qstrip,$(BR2_GCC_TARGET_CPU))
> >
> > +HOST_MESON_SED_CFLAGS = $(if $(TARGET_CFLAGS),`printf '"%s"$(comma) ' $(TARGET_CFLAGS)`)
> > +HOST_MESON_SED_LDFLAGS = $(if $(TARGET_LDFLAGS),`printf '"%s"$(comma) ' $(TARGET_LDFLAGS)`)
> > +HOST_MESON_SED_CXXFLAGS = $(if $(TARGET_CXXFLAGS),`printf '"%s"$(comma) ' $(TARGET_CXXFLAGS)`)
> > +
> > define HOST_MESON_INSTALL_CROSS_CONF
> > mkdir -p $(HOST_DIR)/etc/meson
> > sed -e "s%@TARGET_CROSS@%$(TARGET_CROSS)%g" \
> > -e "s%@TARGET_ARCH@%$(ARCH)%g" \
> > -e "s%@TARGET_CPU@%$(HOST_MESON_TARGET_CPU)%g" \
> > -e "s%@TARGET_ENDIAN@%$(HOST_MESON_TARGET_ENDIAN)%g" \
> > - -e "s%@TARGET_CFLAGS@%`printf '"%s", ' $(TARGET_CFLAGS)`%g" \
> > - -e "s%@TARGET_LDFLAGS@%`printf '"%s", ' $(TARGET_LDFLAGS)`%g" \
> > - -e "s%@TARGET_CXXFLAGS@%`printf '"%s", ' $(TARGET_CXXFLAGS)`%g" \
> > + -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%@HOST_DIR@%$(HOST_DIR)%g" \
> > $(HOST_MESON_PKGDIR)/cross-compilation.conf.in \
> > > $(HOST_DIR)/etc/meson/cross-compilation.conf
> Tested and works well. This needs to be pushed before I can send a
> systemd patch.
To report testing success, one just replies with something like (with no
indentation):
Tested-by: You you at there
This way this gets picked up by patchwork, and reported as such:
https://patchwork.ozlabs.org/project/buildroot/list/
Regards,
Yann E. MORIN.
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 5+ messages in thread
* [Buildroot] [PATCHv2] package/meson: fix malformed cross-compilation.conf.in
2018-01-01 13:02 ` Yann E. MORIN
@ 2018-01-01 15:17 ` Adam Duskett
0 siblings, 0 replies; 5+ messages in thread
From: Adam Duskett @ 2018-01-01 15:17 UTC (permalink / raw)
To: buildroot
Got it! Thanks for the tip!
On Mon, Jan 1, 2018 at 8:02 AM, Yann E. MORIN <yann.morin.1998@free.fr> wrote:
> Adam, All,
>
> On 2017-12-31 16:04 -0500, Adam Duskett spake thusly:
>> On Sat, Dec 30, 2017 at 4:56 AM, Yann E. MORIN <yann.morin.1998@free.fr> wrote:
>> > Currently, meson will set the c_link_args and the cpp_link_args to the
>> > value of TARGET_LDFLAGS, even when it's not defined.
>> >
>> > This creates a malformed array ["",] which will break any package
>> > building using meson/ninja.
>> >
>> > We fix that by using an empty replacement when the corresponding values
>> > are empty.
>> >
>> > Reported-by: Adam Duskett <Adamduskett@outlook.com>
>> > Signed-off-by: Adam Duskett <Adamduskett@outlook.com>
>> > [yann.morin.1998 at free.fr: alternate implementation, suggested by Thomas]
>> > Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
>> > Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
>> > ---
>> > package/meson/meson.mk | 10 +++++++---
>> > 1 file changed, 7 insertions(+), 3 deletions(-)
>> >
>> > diff --git a/package/meson/meson.mk b/package/meson/meson.mk
>> > index 55ce84da07..d55c3c7c00 100644
>> > --- a/package/meson/meson.mk
>> > +++ b/package/meson/meson.mk
>> > @@ -16,15 +16,19 @@ HOST_MESON_NEEDS_HOST_PYTHON = python3
>> > HOST_MESON_TARGET_ENDIAN = $(call LOWERCASE,$(BR2_ENDIAN))
>> > HOST_MESON_TARGET_CPU = $(call qstrip,$(BR2_GCC_TARGET_CPU))
>> >
>> > +HOST_MESON_SED_CFLAGS = $(if $(TARGET_CFLAGS),`printf '"%s"$(comma) ' $(TARGET_CFLAGS)`)
>> > +HOST_MESON_SED_LDFLAGS = $(if $(TARGET_LDFLAGS),`printf '"%s"$(comma) ' $(TARGET_LDFLAGS)`)
>> > +HOST_MESON_SED_CXXFLAGS = $(if $(TARGET_CXXFLAGS),`printf '"%s"$(comma) ' $(TARGET_CXXFLAGS)`)
>> > +
>> > define HOST_MESON_INSTALL_CROSS_CONF
>> > mkdir -p $(HOST_DIR)/etc/meson
>> > sed -e "s%@TARGET_CROSS@%$(TARGET_CROSS)%g" \
>> > -e "s%@TARGET_ARCH@%$(ARCH)%g" \
>> > -e "s%@TARGET_CPU@%$(HOST_MESON_TARGET_CPU)%g" \
>> > -e "s%@TARGET_ENDIAN@%$(HOST_MESON_TARGET_ENDIAN)%g" \
>> > - -e "s%@TARGET_CFLAGS@%`printf '"%s", ' $(TARGET_CFLAGS)`%g" \
>> > - -e "s%@TARGET_LDFLAGS@%`printf '"%s", ' $(TARGET_LDFLAGS)`%g" \
>> > - -e "s%@TARGET_CXXFLAGS@%`printf '"%s", ' $(TARGET_CXXFLAGS)`%g" \
>> > + -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%@HOST_DIR@%$(HOST_DIR)%g" \
>> > $(HOST_MESON_PKGDIR)/cross-compilation.conf.in \
>> > > $(HOST_DIR)/etc/meson/cross-compilation.conf
>
>> Tested and works well. This needs to be pushed before I can send a
>> systemd patch.
>
> To report testing success, one just replies with something like (with no
> indentation):
>
> Tested-by: You you at there
>
> This way this gets picked up by patchwork, and reported as such:
> https://patchwork.ozlabs.org/project/buildroot/list/
>
> Regards,
> Yann E. MORIN.
>
> --
> .-----------------.--------------------.------------------.--------------------.
> | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
> | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
> | +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
> | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
> '------------------------------^-------^------------------^--------------------'
Tested-by: Adam Duskett aduskett at gmail.com
^ permalink raw reply [flat|nested] 5+ messages in thread
* [Buildroot] [PATCHv2] package/meson: fix malformed cross-compilation.conf.in
2017-12-30 9:56 [Buildroot] [PATCHv2] package/meson: fix malformed cross-compilation.conf.in Yann E. MORIN
2017-12-31 21:04 ` Adam Duskett
@ 2018-01-01 22:05 ` Thomas Petazzoni
1 sibling, 0 replies; 5+ messages in thread
From: Thomas Petazzoni @ 2018-01-01 22:05 UTC (permalink / raw)
To: buildroot
Hello,
On Sat, 30 Dec 2017 10:56:35 +0100, Yann E. MORIN wrote:
> Currently, meson will set the c_link_args and the cpp_link_args to the
> value of TARGET_LDFLAGS, even when it's not defined.
>
> This creates a malformed array ["",] which will break any package
> building using meson/ninja.
>
> We fix that by using an empty replacement when the corresponding values
> are empty.
>
> Reported-by: Adam Duskett <Adamduskett@outlook.com>
> Signed-off-by: Adam Duskett <Adamduskett@outlook.com>
> [yann.morin.1998 at free.fr: alternate implementation, suggested by Thomas]
> Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
> Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
> ---
> package/meson/meson.mk | 10 +++++++---
> 1 file changed, 7 insertions(+), 3 deletions(-)
Applied to master, thanks.
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2018-01-01 22:05 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-12-30 9:56 [Buildroot] [PATCHv2] package/meson: fix malformed cross-compilation.conf.in Yann E. MORIN
2017-12-31 21:04 ` Adam Duskett
2018-01-01 13:02 ` Yann E. MORIN
2018-01-01 15:17 ` Adam Duskett
2018-01-01 22:05 ` Thomas Petazzoni
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox