package/sslh: systemd needs libconfig
PATCH 1/1 package/sslh: systemd needs libconfig
systemd-sslh-generator unconditionally uses libconfig
Fixes:
- http://autobuild.buildroot.org/results/d46581842906f7780f4a3a1ae21963e78e7f5276
--- package/sslh/sslh.mk | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-)
package/sslh/sslh.mk +10 -8
@@ -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
Signature · 1 line
2.29.2
PATCH 1/1 package/sslh: systemd needs libconfig
Fabrice, All,
On 2021-01-25 23:34 +0100, Fabrice Fontaine spake thusly:
Quoted 34 lines
systemd-sslh-generator unconditionally uses libconfig
Fixes:
- http://autobuild.buildroot.org/results/d46581842906f7780f4a3a1ae21963e78e7f5276Signed-off-by Fabrice Fontaine <[email protected]>--- package/sslh/sslh.mk | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-)package/sslh/sslh.mk +10
-1@@ -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)
package/sslh/sslh.mk else · line 48
Quoted 9 lines
package/sslh/sslh.mk +0
-6@@ -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.
Quoted 10 lines
package/sslh/sslh.mk +0
-0define SSLH_BUILD_CMDS $(TARGET_MAKE_ENV) $(MAKE) $(SSLH_MAKE_OPTS) -C $(@D) endefSignature · 6 lines
2.29.2 _______________________________________________ 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/sslh: systemd needs libconfig
In reply to Fabrice FontaineQuoted 7 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Fabrice" == Fabrice Fontaine <[email protected]> writes:
systemd-sslh-generator unconditionally uses libconfig
Fixes:
- http://autobuild.buildroot.org/results/d46581842906f7780f4a3a1ae21963e78e7f5276Signed-off-by Fabrice Fontaine <[email protected]>
Committed to 2020.11.x, thanks.
Signature · 1 line
Bye, Peter Korsgaard