2c490f00c8
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
884af65fd5, 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>
62 lines
1.6 KiB
Makefile
62 lines
1.6 KiB
Makefile
################################################################################
|
|
#
|
|
# libsigrok
|
|
#
|
|
################################################################################
|
|
|
|
LIBSIGROK_VERSION = 55462b8ba9f48931de9b9a7bfbc182a1d113b3b5
|
|
# No https access on upstream git
|
|
LIBSIGROK_SITE = git://sigrok.org/libsigrok
|
|
LIBSIGROK_LICENSE = GPLv3+
|
|
LIBSIGROK_LICENSE_FILES = COPYING
|
|
# Git checkout has no configure script
|
|
LIBSIGROK_AUTORECONF = YES
|
|
LIBSIGROK_INSTALL_STAGING = YES
|
|
LIBSIGROK_DEPENDENCIES = libglib2 libzip host-pkgconf
|
|
LIBSIGROK_CONF_OPTS = --disable-glibtest --disable-java --disable-python
|
|
|
|
define LIBSIGROK_ADD_MISSING
|
|
mkdir -p $(@D)/autostuff
|
|
endef
|
|
|
|
LIBSIGROK_PRE_CONFIGURE_HOOKS += LIBSIGROK_ADD_MISSING
|
|
|
|
ifeq ($(BR2_PACKAGE_LIBSERIALPORT),y)
|
|
LIBSIGROK_CONF_OPTS += --enable-libserialport
|
|
LIBSIGROK_DEPENDENCIES += libserialport
|
|
else
|
|
LIBSIGROK_CONF_OPTS += --disable-libserialport
|
|
endif
|
|
|
|
ifeq ($(BR2_PACKAGE_LIBFTDI),y)
|
|
LIBSIGROK_CONF_OPTS += --enable-libftdi
|
|
LIBSIGROK_DEPENDENCIES += libftdi
|
|
else
|
|
LIBSIGROK_CONF_OPTS += --disable-libftdi
|
|
endif
|
|
|
|
ifeq ($(BR2_PACKAGE_LIBUSB),y)
|
|
LIBSIGROK_CONF_OPTS += --enable-libusb
|
|
LIBSIGROK_DEPENDENCIES += libusb
|
|
else
|
|
LIBSIGROK_CONF_OPTS += --disable-libusb
|
|
endif
|
|
|
|
ifeq ($(BR2_PACKAGE_GLIBMM),y)
|
|
LIBSIGROK_DEPENDENCIES += glibmm
|
|
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 \
|
|
host-doxygen \
|
|
$(if $(BR2_PACKAGE_PYTHON3),host-python3,host-python)
|
|
else
|
|
LIBSIGROK_CONF_OPTS += --disable-cxx
|
|
endif
|
|
|
|
$(eval $(autotools-package))
|