* [Buildroot] [git commit branch/next] systemd: add optional dependency on libidn2
@ 2018-05-20 14:12 Thomas Petazzoni
2018-05-22 21:17 ` Arnout Vandecappelle
0 siblings, 1 reply; 4+ messages in thread
From: Thomas Petazzoni @ 2018-05-20 14:12 UTC (permalink / raw)
To: buildroot
commit: https://git.buildroot.net/buildroot/commit/?id=4ded5d6af4f0198036183f00de190569d7578bc3
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
[Thomas: simplify ifeq/else/endif sequence.]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
---
package/systemd/systemd.mk | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk
index db7fb43636..1e4b257731 100644
--- a/package/systemd/systemd.mk
+++ b/package/systemd/systemd.mk
@@ -75,11 +75,15 @@ else
SYSTEMD_CONF_OPTS += -Daudit=false
endif
-ifeq ($(BR2_PACKAGE_LIBIDN),y)
+# Both options can't be selected at the same time so prefer libidn2
+ifeq ($(BR2_PACKAGE_LIBIDN2),y)
+SYSTEMD_DEPENDENCIES += libidn2
+SYSTEMD_CONF_OPTS += -Dlibidn2=true -Dlibidn=false
+else ifeq ($(BR2_PACKAGE_LIBIDN),y)
SYSTEMD_DEPENDENCIES += libidn
-SYSTEMD_CONF_OPTS += -Dlibidn=true
+SYSTEMD_CONF_OPTS += -Dlibidn=true -Dlibidn2=false
else
-SYSTEMD_CONF_OPTS += -Dlibidn=false
+SYSTEMD_CONF_OPTS += -Dlibidn=false -Dlibidn2=true
endif
ifeq ($(BR2_PACKAGE_LIBSECCOMP),y)
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [Buildroot] [git commit branch/next] systemd: add optional dependency on libidn2
2018-05-20 14:12 [Buildroot] [git commit branch/next] systemd: add optional dependency on libidn2 Thomas Petazzoni
@ 2018-05-22 21:17 ` Arnout Vandecappelle
2018-05-22 21:49 ` Fabrice Fontaine
0 siblings, 1 reply; 4+ messages in thread
From: Arnout Vandecappelle @ 2018-05-22 21:17 UTC (permalink / raw)
To: buildroot
On 20-05-18 16:12, Thomas Petazzoni wrote:
> commit: https://git.buildroot.net/buildroot/commit/?id=4ded5d6af4f0198036183f00de190569d7578bc3
> branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next
>
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> [Thomas: simplify ifeq/else/endif sequence.]
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
> ---
> package/systemd/systemd.mk | 10 +++++++---
> 1 file changed, 7 insertions(+), 3 deletions(-)
>
> diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk
> index db7fb43636..1e4b257731 100644
> --- a/package/systemd/systemd.mk
> +++ b/package/systemd/systemd.mk
> @@ -75,11 +75,15 @@ else
> SYSTEMD_CONF_OPTS += -Daudit=false
> endif
>
> -ifeq ($(BR2_PACKAGE_LIBIDN),y)
> +# Both options can't be selected at the same time so prefer libidn2
> +ifeq ($(BR2_PACKAGE_LIBIDN2),y)
> +SYSTEMD_DEPENDENCIES += libidn2
> +SYSTEMD_CONF_OPTS += -Dlibidn2=true -Dlibidn=false
> +else ifeq ($(BR2_PACKAGE_LIBIDN),y)
> SYSTEMD_DEPENDENCIES += libidn
> -SYSTEMD_CONF_OPTS += -Dlibidn=true
> +SYSTEMD_CONF_OPTS += -Dlibidn=true -Dlibidn2=false
> else
> -SYSTEMD_CONF_OPTS += -Dlibidn=false
> +SYSTEMD_CONF_OPTS += -Dlibidn=false -Dlibidn2=true
Shouldn't this be -Dlibidn2=false ?
Regards,
Arnout
> endif
>
> ifeq ($(BR2_PACKAGE_LIBSECCOMP),y)
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
>
--
Arnout Vandecappelle arnout at mind be
Senior Embedded Software Architect +32-16-286500
Essensium/Mind http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint: 7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF
^ permalink raw reply [flat|nested] 4+ messages in thread
* [Buildroot] [git commit branch/next] systemd: add optional dependency on libidn2
2018-05-22 21:17 ` Arnout Vandecappelle
@ 2018-05-22 21:49 ` Fabrice Fontaine
2018-05-23 6:01 ` Thomas Petazzoni
0 siblings, 1 reply; 4+ messages in thread
From: Fabrice Fontaine @ 2018-05-22 21:49 UTC (permalink / raw)
To: buildroot
Dear Arnout,
2018-05-22 23:17 GMT+02:00 Arnout Vandecappelle <arnout@mind.be>:
>
>
> On 20-05-18 16:12, Thomas Petazzoni wrote:
> > commit: https://git.buildroot.net/buildroot/commit/?id=
> 4ded5d6af4f0198036183f00de190569d7578bc3
> > branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next
> >
> > Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> > [Thomas: simplify ifeq/else/endif sequence.]
> > Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
> > ---
> > package/systemd/systemd.mk | 10 +++++++---
> > 1 file changed, 7 insertions(+), 3 deletions(-)
> >
> > diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk
> > index db7fb43636..1e4b257731 100644
> > --- a/package/systemd/systemd.mk
> > +++ b/package/systemd/systemd.mk
> > @@ -75,11 +75,15 @@ else
> > SYSTEMD_CONF_OPTS += -Daudit=false
> > endif
> >
> > -ifeq ($(BR2_PACKAGE_LIBIDN),y)
> > +# Both options can't be selected at the same time so prefer libidn2
> > +ifeq ($(BR2_PACKAGE_LIBIDN2),y)
> > +SYSTEMD_DEPENDENCIES += libidn2
> > +SYSTEMD_CONF_OPTS += -Dlibidn2=true -Dlibidn=false
> > +else ifeq ($(BR2_PACKAGE_LIBIDN),y)
> > SYSTEMD_DEPENDENCIES += libidn
> > -SYSTEMD_CONF_OPTS += -Dlibidn=true
> > +SYSTEMD_CONF_OPTS += -Dlibidn=true -Dlibidn2=false
> > else
> > -SYSTEMD_CONF_OPTS += -Dlibidn=false
> > +SYSTEMD_CONF_OPTS += -Dlibidn=false -Dlibidn2=true
>
> Shouldn't this be -Dlibidn2=false ?
>
Indeed, you're completly right, thanks for spotting the mistake.
> Regards,
> Arnout
>
> > endif
> >
> > ifeq ($(BR2_PACKAGE_LIBSECCOMP),y)
> > _______________________________________________
> > buildroot mailing list
> > buildroot at busybox.net
> > http://lists.busybox.net/mailman/listinfo/buildroot
> >
>
> --
> Arnout Vandecappelle arnout at mind be
> Senior Embedded Software Architect +32-16-286500
> Essensium/Mind http://www.mind.be
> G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven
> LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
> GPG fingerprint: 7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF
>
Best Regards,
Fabrice
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20180522/a3ec7c7b/attachment.html>
^ permalink raw reply [flat|nested] 4+ messages in thread
* [Buildroot] [git commit branch/next] systemd: add optional dependency on libidn2
2018-05-22 21:49 ` Fabrice Fontaine
@ 2018-05-23 6:01 ` Thomas Petazzoni
0 siblings, 0 replies; 4+ messages in thread
From: Thomas Petazzoni @ 2018-05-23 6:01 UTC (permalink / raw)
To: buildroot
Hello,
On Tue, 22 May 2018 23:49:38 +0200, Fabrice Fontaine wrote:
> > > -SYSTEMD_CONF_OPTS += -Dlibidn=false
> > > +SYSTEMD_CONF_OPTS += -Dlibidn=false -Dlibidn2=true
> >
> > Shouldn't this be -Dlibidn2=false ?
> >
> Indeed, you're completly right, thanks for spotting the mistake.
It's not your fault I believe, but mine. I reworked this patch of your
patch when applying and got it wrong.
I've pushed a commit that fixes that. Thanks Arnout for spotting, and
sorry Fabrice for this mistake :/
Best regards,
Thomas
--
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2018-05-23 6:01 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-05-20 14:12 [Buildroot] [git commit branch/next] systemd: add optional dependency on libidn2 Thomas Petazzoni
2018-05-22 21:17 ` Arnout Vandecappelle
2018-05-22 21:49 ` Fabrice Fontaine
2018-05-23 6:01 ` Thomas Petazzoni
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox