* [Buildroot] [PATCH 1/1] package/sslh: systemd needs libconfig
@ 2021-01-25 22:34 Fabrice Fontaine
2021-01-26 17:25 ` Yann E. MORIN
2021-01-28 20:01 ` Peter Korsgaard
0 siblings, 2 replies; 3+ messages in thread
From: Fabrice Fontaine @ 2021-01-25 22:34 UTC (permalink / raw)
To: buildroot
systemd-sslh-generator unconditionally uses libconfig
Fixes:
- http://autobuild.buildroot.org/results/d46581842906f7780f4a3a1ae21963e78e7f5276
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
package/sslh/sslh.mk | 18 ++++++++++--------
1 file changed, 10 insertions(+), 8 deletions(-)
diff --git a/package/sslh/sslh.mk b/package/sslh/sslh.mk
index 4bde143cd8..c98f1a6675 100644
--- a/package/sslh/sslh.mk
+++ b/package/sslh/sslh.mk
@@ -29,8 +29,17 @@ endif
ifeq ($(BR2_PACKAGE_LIBCONFIG),y)
SSLH_DEPENDENCIES += libconfig
SSLH_MAKE_OPTS += USELIBCONFIG=1
+
+ifeq ($(BR2_PACKAGE_SYSTEMD),y)
+SSLH_DEPENDENCIES += systemd
+SSLH_MAKE_OPTS += USESYSTEMD=1
+else
+SSLH_MAKE_OPTS += USESYSTEMD=
+endif
else
-SSLH_MAKE_OPTS += USELIBCONFIG=
+SSLH_MAKE_OPTS += \
+ USELIBCONFIG= \
+ USESYSTEMD=
endif
ifeq ($(BR2_PACKAGE_PCRE),y)
@@ -40,13 +49,6 @@ else
SSLH_MAKE_OPTS += USELIBPCRE=
endif
-ifeq ($(BR2_PACKAGE_SYSTEMD),y)
-SSLH_DEPENDENCIES += systemd
-SSLH_MAKE_OPTS += USESYSTEMD=1
-else
-SSLH_MAKE_OPTS += USESYSTEMD=
-endif
-
define SSLH_BUILD_CMDS
$(TARGET_MAKE_ENV) $(MAKE) $(SSLH_MAKE_OPTS) -C $(@D)
endef
--
2.29.2
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [Buildroot] [PATCH 1/1] package/sslh: systemd needs libconfig
2021-01-25 22:34 [Buildroot] [PATCH 1/1] package/sslh: systemd needs libconfig Fabrice Fontaine
@ 2021-01-26 17:25 ` Yann E. MORIN
2021-01-28 20:01 ` Peter Korsgaard
1 sibling, 0 replies; 3+ messages in thread
From: Yann E. MORIN @ 2021-01-26 17:25 UTC (permalink / raw)
To: buildroot
Fabrice, All,
On 2021-01-25 23:34 +0100, Fabrice Fontaine spake thusly:
> systemd-sslh-generator unconditionally uses libconfig
>
> Fixes:
> - http://autobuild.buildroot.org/results/d46581842906f7780f4a3a1ae21963e78e7f5276
>
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> ---
> package/sslh/sslh.mk | 18 ++++++++++--------
> 1 file changed, 10 insertions(+), 8 deletions(-)
>
> diff --git a/package/sslh/sslh.mk b/package/sslh/sslh.mk
> index 4bde143cd8..c98f1a6675 100644
> --- a/package/sslh/sslh.mk
> +++ b/package/sslh/sslh.mk
> @@ -29,8 +29,17 @@ endif
> ifeq ($(BR2_PACKAGE_LIBCONFIG),y)
> SSLH_DEPENDENCIES += libconfig
> SSLH_MAKE_OPTS += USELIBCONFIG=1
> +
> +ifeq ($(BR2_PACKAGE_SYSTEMD),y)
> +SSLH_DEPENDENCIES += systemd
> +SSLH_MAKE_OPTS += USESYSTEMD=1
> +else
> +SSLH_MAKE_OPTS += USESYSTEMD=
> +endif
> else
> -SSLH_MAKE_OPTS += USELIBCONFIG=
> +SSLH_MAKE_OPTS += \
> + USELIBCONFIG= \
> + USESYSTEMD=
> endif
>
> ifeq ($(BR2_PACKAGE_PCRE),y)
> @@ -40,13 +49,6 @@ else
> SSLH_MAKE_OPTS += USELIBPCRE=
> endif
>
> -ifeq ($(BR2_PACKAGE_SYSTEMD),y)
> -SSLH_DEPENDENCIES += systemd
> -SSLH_MAKE_OPTS += USESYSTEMD=1
> -else
> -SSLH_MAKE_OPTS += USESYSTEMD=
> -endif
I found it much simpler to select libconfig from Config.in, so I changed
the patch to do just that, and pushed to master.
At the risk of lying slightly: applied to master, thanks.
Regards,
Yann E. MORIN.
> define SSLH_BUILD_CMDS
> $(TARGET_MAKE_ENV) $(MAKE) $(SSLH_MAKE_OPTS) -C $(@D)
> endef
> --
> 2.29.2
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
--
.-----------------.--------------------.------------------.--------------------.
| 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. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 3+ messages in thread
* [Buildroot] [PATCH 1/1] package/sslh: systemd needs libconfig
2021-01-25 22:34 [Buildroot] [PATCH 1/1] package/sslh: systemd needs libconfig Fabrice Fontaine
2021-01-26 17:25 ` Yann E. MORIN
@ 2021-01-28 20:01 ` Peter Korsgaard
1 sibling, 0 replies; 3+ messages in thread
From: Peter Korsgaard @ 2021-01-28 20:01 UTC (permalink / raw)
To: buildroot
>>>>> "Fabrice" == Fabrice Fontaine <fontaine.fabrice@gmail.com> writes:
> systemd-sslh-generator unconditionally uses libconfig
> Fixes:
> - http://autobuild.buildroot.org/results/d46581842906f7780f4a3a1ae21963e78e7f5276
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Committed to 2020.11.x, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-01-28 20:01 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-01-25 22:34 [Buildroot] [PATCH 1/1] package/sslh: systemd needs libconfig Fabrice Fontaine
2021-01-26 17:25 ` Yann E. MORIN
2021-01-28 20:01 ` Peter Korsgaard
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.