summaryrefslogtreecommitdiff
path: root/package/libsigrok
diff options
context:
space:
mode:
authorThomas Petazzoni <thomas.petazzoni@free-electrons.com>2015-05-14 22:57:15 +0200
committerPeter Korsgaard <peter@korsgaard.com>2015-05-15 00:59:31 +0200
commit2c490f00c8d8a7d34ed6da9130cef8a5e97cef56 (patch)
tree40cdee7905056c8553eecf86832990045f15f0a7 /package/libsigrok
parent9e67d499f14efd24dd3179ddc40f15aadb4d200a (diff)
host-autoconf-archive: install to a non-standard location
The host-autoconf-archive package was added to provide the necessary autoconf macros for the libsigrok package, and later also used for the thrift package. However, it installs its autoconf macro in $(HOST_DIR)/usr/share/aclocal, which is part of the include directory of autoconf macros used for all autoreconf invocations. Unfortunately, using those macros for all packages is causing a number of regressions: one on host-ola fixed in commit 884af65fd5ddc548f19a26162f905a32ef0b53b3, and one in snmpp. Those packages are autoreconf'ed, but if they are autoreconf'ed with the autoconf-archive macros installed, they no longer work. To solve this problem, this commit implements a simple solution that makes using host-autoconf-archive macros an opt-in mechanism. To achieve this, the autoconf-archive package is modified to install its macros in a special directory, and only the packages that really want to use those macros will have to pass a -I flag pointing to this directory in their <pkg>_AUTORECONF_OPTS variable. Fixes: http://autobuild.buildroot.org/results/712/712c8083b9eeafa41b60790961028c40b28f59ad/ Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Reviewed-by: Romain Naour <romain.naour@openwide.fr> Tested-by: Romain Naour <romain.naour@openwide.fr> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/libsigrok')
-rw-r--r--package/libsigrok/libsigrok.mk1
1 files changed, 1 insertions, 0 deletions
diff --git a/package/libsigrok/libsigrok.mk b/package/libsigrok/libsigrok.mk
index 7394f649d..21d825941 100644
--- a/package/libsigrok/libsigrok.mk
+++ b/package/libsigrok/libsigrok.mk
@@ -48,6 +48,7 @@ endif
ifeq ($(BR2_PACKAGE_LIBSIGROKCXX),y)
LIBSIGROK_CONF_OPTS += --enable-cxx
+LIBSIGROK_AUTORECONF_OPTS += -I $(HOST_DIR)/usr/share/autoconf-archive
LIBSIGROK_DEPENDENCIES += \
host-autoconf-archive \
glibmm \