| Message ID | 20190127185943.1136-2-ricardo.martincoski@gmail.com |
|---|---|
| State | Accepted |
| Commit | 30ff614a035dd49e357f7c3560555dae8e605f80 |
| Headers | show |
| Series | Detect and fix overridden variables in .mk files | expand |
Hello Ricardo, On Sun, 27 Jan 2019 16:59:36 -0200 Ricardo Martincoski <ricardo.martincoski@gmail.com> wrote: > Commit "c5b85231fb s6-networking: enable SSL if libressl is selected" > actually dropped the dependency on s6-dns and s6 when libressl is > enabled. > Fix this by using += inside the conditional code. > > Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com> > Cc: Eric Le Bihan <eric.le.bihan.dev@free.fr> > --- > NOTE: I don't know why the autobuilders didn't caught this. Because libressl is selected as part of a choice..endchoice, and such choices are not randomized by "randpackageconfig". Therefore, only OpenSSL is tested by the autobuilders, and LibreSSL is never tested. Best regards, Thomas
>>>>> "Ricardo" == Ricardo Martincoski <ricardo.martincoski@gmail.com> writes: > Commit "c5b85231fb s6-networking: enable SSL if libressl is selected" > actually dropped the dependency on s6-dns and s6 when libressl is > enabled. > Fix this by using += inside the conditional code. > Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com> > Cc: Eric Le Bihan <eric.le.bihan.dev@free.fr> Committed, thanks.
Hello, On Sun, Jan 27, 2019 at 05:52 PM, Thomas Petazzoni wrote: > On Sun, 27 Jan 2019 16:59:36 -0200 > Ricardo Martincoski <ricardo.martincoski@gmail.com> wrote: > >> Commit "c5b85231fb s6-networking: enable SSL if libressl is selected" >> actually dropped the dependency on s6-dns and s6 when libressl is >> enabled. >> Fix this by using += inside the conditional code. >> >> Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com> >> Cc: Eric Le Bihan <eric.le.bihan.dev@free.fr> >> --- >> NOTE: I don't know why the autobuilders didn't caught this. > > Because libressl is selected as part of a choice..endchoice, and such > choices are not randomized by "randpackageconfig". Therefore, only > OpenSSL is tested by the autobuilders, and LibreSSL is never tested. Right. Thank you for the clarification. Regards, Ricardo
>>>>> "Ricardo" == Ricardo Martincoski <ricardo.martincoski@gmail.com> writes: > Commit "c5b85231fb s6-networking: enable SSL if libressl is selected" > actually dropped the dependency on s6-dns and s6 when libressl is > enabled. > Fix this by using += inside the conditional code. > Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com> > Cc: Eric Le Bihan <eric.le.bihan.dev@free.fr> Committed to 2018.02.x and 2018.11.x, thanks.
diff --git a/package/s6-networking/s6-networking.mk b/package/s6-networking/s6-networking.mk index 7c9f087051..b621eb225d 100644 --- a/package/s6-networking/s6-networking.mk +++ b/package/s6-networking/s6-networking.mk @@ -12,33 +12,33 @@ S6_NETWORKING_INSTALL_STAGING = YES S6_NETWORKING_DEPENDENCIES = s6-dns s6 S6_NETWORKING_CONF_OPTS = \ --prefix=/usr \ --with-sysdeps=$(STAGING_DIR)/usr/lib/skalibs/sysdeps \ --with-include=$(STAGING_DIR)/usr/include \ --with-dynlib=$(STAGING_DIR)/usr/lib \ --with-lib=$(STAGING_DIR)/usr/lib/execline \ --with-lib=$(STAGING_DIR)/usr/lib/s6 \ --with-lib=$(STAGING_DIR)/usr/lib/s6-dns \ --with-lib=$(STAGING_DIR)/usr/lib/skalibs \ $(if $(BR2_STATIC_LIBS),,--disable-allstatic) \ $(SHARED_STATIC_LIBS_OPTS) ifeq ($(BR2_PACKAGE_LIBRESSL),y) S6_NETWORKING_CONF_OPTS += --enable-ssl=libressl -S6_NETWORKING_DEPENDENCIES = libressl +S6_NETWORKING_DEPENDENCIES += libressl endif define S6_NETWORKING_CONFIGURE_CMDS (cd $(@D); $(TARGET_CONFIGURE_OPTS) ./configure $(S6_NETWORKING_CONF_OPTS)) endef define S6_NETWORKING_BUILD_CMDS $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) endef define S6_NETWORKING_REMOVE_STATIC_LIB_DIR rm -rf $(TARGET_DIR)/usr/lib/s6-networking endef S6_NETWORKING_POST_INSTALL_TARGET_HOOKS += S6_NETWORKING_REMOVE_STATIC_LIB_DIR
Commit "c5b85231fb s6-networking: enable SSL if libressl is selected" actually dropped the dependency on s6-dns and s6 when libressl is enabled. Fix this by using += inside the conditional code. Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com> Cc: Eric Le Bihan <eric.le.bihan.dev@free.fr> --- NOTE: I don't know why the autobuilders didn't caught this. On current master (f6843a75fe), test-pkg with this config: BR2_PACKAGE_OPENSSL=y BR2_PACKAGE_LIBRESSL=y BR2_PACKAGE_S6_NETWORKING=y results in: 6 builds, 1 skipped, 5 build failed, 0 legal-info failed After this patch: 6 builds, 1 skipped, 0 build failed, 0 legal-info failed --- package/s6-networking/s6-networking.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)