| Message ID | ad8eed5a1643cc3be56f317dcac61cb1314fc40a.1458157108.git.baruch@tkos.co.il |
|---|---|
| State | Accepted |
| Headers | show |
Hello, On Wed, 16 Mar 2016 21:38:28 +0200, Baruch Siach wrote: > 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 <baruch@tkos.co.il> 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
Hi Thomas, On Tue, Mar 29, 2016 at 03:05:49PM +0200, Thomas Petazzoni wrote: > On Wed, 16 Mar 2016 21:38:28 +0200, Baruch Siach wrote: > > 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 <baruch@tkos.co.il> > > 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
Hello, On Tue, 29 Mar 2016 20:33:14 +0300, Baruch Siach wrote: > > 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
diff --git a/package/linknx/Config.in b/package/linknx/Config.in index 36838fed6c0f..ca55c8bfb2f5 100644 --- a/package/linknx/Config.in +++ b/package/linknx/Config.in @@ -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 diff --git a/package/linknx/linknx.mk b/package/linknx/linknx.mk index 9d1f75e122aa..5dc8bb2d0839 100644 --- a/package/linknx/linknx.mk +++ b/package/linknx/linknx.mk @@ -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))
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 <baruch@tkos.co.il> --- package/linknx/Config.in | 1 + package/linknx/linknx.mk | 13 ++++--------- 2 files changed, 5 insertions(+), 9 deletions(-)