linknx: select libcurl to fix autoreconf

PATCH New Baruch Siach 2 participants 4 messages Mar 16, 2016 – Mar 29, 2016

Share & tools

Baruch Siach

author

2016-03-16 19:38 UTC #0 lore raw

PATCH 1/1 linknx: select libcurl to fix autoreconf

linknx configure.ac uses the LIBCURL_CHECK_CONFIG macro that is only defined in libcurl.m4 that is part of libcurl. Select libcurl for now to fix autoreconf.

Fixes:
http://autobuild.buildroot.net/results/96e/96e9ae0df7ebb7ad3d748a6b518cc59570e0b995/
http://autobuild.buildroot.net/results/179/17971c9f8925ff8623a7d97aac8eda0c287a76c9/
http://autobuild.buildroot.net/results/2a8/2a8af93d6439b313b048ccac7b6cfecbb6baff55/

Signed-off-by Baruch Siach <[email protected]>

---
 package/linknx/Config.in |  1 +
 package/linknx/linknx.mk | 13 ++++---------
 2 files changed, 5 insertions(+), 9 deletions(-)

package/linknx/Config.in +1 -0

index 36838fed6c0f..ca55c8bfb2f5 100644
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_LINKNX
 	bool "linknx"
 	select BR2_PACKAGE_LIBPTHSEM
+	select BR2_PACKAGE_LIBCURL # for autoreconf
 	select BR2_PACKAGE_ARGP_STANDALONE \
 	       if BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_MUSL
 	depends on BR2_INSTALL_LIBSTDCPP

package/linknx/linknx.mk +4 -9

index 9d1f75e122aa..5dc8bb2d0839 100644
@@ -15,9 +15,11 @@ LINKNX_CONF_OPTS = \
 	--without-log4cpp \
 	--without-pth-test \
 	--with-pth=$(STAGING_DIR)/usr \
-	--disable-smtp
+	--disable-smtp \
+	--with-libcurl=$(STAGING_DIR)/usr/bin/curl-config
 
-LINKNX_DEPENDENCIES = libpthsem $(if $(BR2_PACKAGE_ARGP_STANDALONE),argp-standalone)
+LINKNX_DEPENDENCIES = libpthsem libcurl \
+	$(if $(BR2_PACKAGE_ARGP_STANDALONE),argp-standalone)
 
 # This is needed to make autoreconf happy
 define LINKNX_CREATE_MISSING_FILES

@@ -32,11 +34,4 @@ else
 LINKNX_CONF_OPTS += --without-mysql
 endif
 
-ifeq ($(BR2_PACKAGE_LIBCURL),y)
-LINKNX_CONF_OPTS += --with-libcurl=$(STAGING_DIR)/usr/bin/curl-config
-LINKNX_DEPENDENCIES += libcurl
-else
-LINKNX_CONF_OPTS += --without-libcurl
-endif
-
 $(eval $(autotools-package))

Signature · 1 line

2.7.0

Thomas Petazzoni

Applied

2016-03-29 13:05 UTC #1 lore raw

PATCH 1/1 linknx: select libcurl to fix autoreconf

Hello,

Quoted 10 lines · Baruch Siach

linknx configure.ac uses the LIBCURL_CHECK_CONFIG macro that is only defined in libcurl.m4 that is part of libcurl. Select libcurl for now to fix autoreconf.
Fixes:
http://autobuild.buildroot.net/results/96e/96e9ae0df7ebb7ad3d748a6b518cc59570e0b995/
http://autobuild.buildroot.net/results/179/17971c9f8925ff8623a7d97aac8eda0c287a76c9/
http://autobuild.buildroot.net/results/2a8/2a8af93d6439b313b048ccac7b6cfecbb6baff55/
Signed-off-by Baruch Siach <[email protected]>

It's not super nice to have to add this mandatory dependency for autoreconf, but we indeed don't really have the choice. We should remember to revert this patch once the linknx patch gets merged upstream, and we bump the version. However, it seems like linknx is not super active upstream, so in fact things might just stay forever as they are today. Oh well.

Applied, thanks!

Thomas

Signature · 3 lines

Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

Baruch Siach

author

2016-03-29 17:33 UTC #2 lore raw

PATCH 1/1 linknx: select libcurl to fix autoreconf

Hi Thomas,

Quoted 10 lines · Thomas Petazzoni

Quoted 9 lines · Baruch Siach
linknx configure.ac uses the LIBCURL_CHECK_CONFIG macro that is only defined in libcurl.m4 that is part of libcurl. Select libcurl for now to fix autoreconf.
Fixes:
http://autobuild.buildroot.net/results/96e/96e9ae0df7ebb7ad3d748a6b518cc59570e0b995/
http://autobuild.buildroot.net/results/179/17971c9f8925ff8623a7d97aac8eda0c287a76c9/
http://autobuild.buildroot.net/results/2a8/2a8af93d6439b313b048ccac7b6cfecbb6baff55/

Quoted 8 lines

Quoted 1 line
Signed-off-by Baruch Siach <[email protected]>
It's not super nice to have to add this mandatory dependency for autoreconf, but we indeed don't really have the choice. We should remember to revert this patch once the linknx patch gets merged upstream, and we bump the version. However, it seems like linknx is not super active upstream, so in fact things might just stay forever as they are today. Oh well.

A possible alternative is to have a local copy of libcurl.m4 for linknx, either in a patch or standalone. Would you prefer that?

baruch

Signature · 3 lines

     http://baruch.siach.name/blog/                  ~. .~   Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
   - baruch at tkos.co.il - tel: +972.2.679.5364, http://www.tkos.co.il -

Thomas Petazzoni

2016-03-29 17:58 UTC #3 lore raw

PATCH 1/1 linknx: select libcurl to fix autoreconf

Hello,

Quoted 9 lines · Baruch Siach

Quoted 6 lines
It's not super nice to have to add this mandatory dependency for autoreconf, but we indeed don't really have the choice. We should remember to revert this patch once the linknx patch gets merged upstream, and we bump the version. However, it seems like linknx is not super active upstream, so in fact things might just stay forever as they are today. Oh well.
A possible alternative is to have a local copy of libcurl.m4 for linknx, either in a patch or standalone. Would you prefer that?

Nah, I think it's better to depend on libcurl. It's not like it's a big dependency, and it's not like linknx is a very important package. So let's not spend too much time on this.

Thanks!

Thomas

Signature · 3 lines

Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com