b4dfee63d2
configure checks if ldap_set_rebind_proc takes 2 or 3 arguments http://svn.apache.org/viewvc/apr/apr-util/tags/1.6.1/build/apu-conf.m4?revision=1812528&view=markup#l370 It uses the macro APR_TRY_COMPILE_NO_WARNING which adds -Werror to treat all warnings as errors when gcc is used: http://svn.apache.org/viewvc/apr/apr/tags/1.6.3/build/apr_common.m4?revision=1812527&view=markup#l504 In some buildroot configs a compiler warning occurs during this check: http://autobuild.buildroot.net/results/241/241ed78b93ce86c859e175530fa485711ff61615//apr-util-1.6.1/config.log /home/rclinux/rc-buildroot-test/scripts/instance-1/output/host/arm-buildroot-linux-uclibcgnueabihf/sysroot/usr/include/features.h:218:5: error: #warning requested reentrant code, but thread support was disabled [-Werror=cpp] cc1: all warnings being treated as errors Due to this warning 'ac_cv_ldap_set_rebind_proc_style' is set to two instead of three leading to a build error later on. This patch forces ac_cv_ldap_set_rebind_proc_style=three to be inline with openldap which fixes http://autobuild.buildroot.net/results/241/241ed78b93ce86c859e175530fa485711ff61615/ This solution was inspired by a discussion on the fink mailinglist: https://sourceforge.net/p/fink/mailman/message/31720482/ Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
85 lines
2.3 KiB
Makefile
85 lines
2.3 KiB
Makefile
################################################################################
|
|
#
|
|
# apr-util
|
|
#
|
|
################################################################################
|
|
|
|
APR_UTIL_VERSION = 1.6.1
|
|
APR_UTIL_SOURCE = apr-util-$(APR_UTIL_VERSION).tar.bz2
|
|
APR_UTIL_SITE = http://archive.apache.org/dist/apr
|
|
APR_UTIL_LICENSE = Apache-2.0
|
|
APR_UTIL_LICENSE_FILES = LICENSE
|
|
APR_UTIL_INSTALL_STAGING = YES
|
|
APR_UTIL_DEPENDENCIES = apr expat
|
|
APR_UTIL_CONF_OPTS = \
|
|
--with-apr=$(STAGING_DIR)/usr/bin/apr-1-config
|
|
APR_UTIL_CONFIG_SCRIPTS = apu-1-config
|
|
|
|
# When iconv is available, then use it to provide charset conversion
|
|
# features.
|
|
APR_UTIL_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBICONV),libiconv)
|
|
|
|
ifeq ($(BR2_PACKAGE_BERKELEYDB),y)
|
|
APR_UTIL_CONF_OPTS += --with-dbm=db53 --with-berkeley-db="$(STAGING_DIR)/usr"
|
|
APR_UTIL_DEPENDENCIES += berkeleydb
|
|
else
|
|
APR_UTIL_CONF_OPTS += --without-berkeley-db
|
|
endif
|
|
|
|
ifeq ($(BR2_PACKAGE_GDBM),y)
|
|
APR_UTIL_CONF_OPTS += --with-gdbm="$(STAGING_DIR)/usr"
|
|
APR_UTIL_DEPENDENCIES += gdbm
|
|
else
|
|
APR_UTIL_CONF_OPTS += --without-gdbm
|
|
endif
|
|
|
|
ifeq ($(BR2_PACKAGE_MYSQL),y)
|
|
APR_UTIL_CONF_OPTS += --with-mysql="$(STAGING_DIR)/usr"
|
|
APR_UTIL_DEPENDENCIES += mysql
|
|
else
|
|
APR_UTIL_CONF_OPTS += --without-mysql
|
|
endif
|
|
|
|
ifeq ($(BR2_PACKAGE_SQLITE),y)
|
|
APR_UTIL_CONF_OPTS += --with-sqlite3="$(STAGING_DIR)/usr"
|
|
APR_UTIL_DEPENDENCIES += sqlite
|
|
else
|
|
APR_UTIL_CONF_OPTS += --without-sqlite3
|
|
endif
|
|
|
|
ifeq ($(BR2_PACKAGE_OPENLDAP),y)
|
|
APR_UTIL_CONF_ENV += ac_cv_ldap_set_rebind_proc_style=three
|
|
APR_UTIL_CONF_OPTS += \
|
|
--with-ldap \
|
|
--with-ldap-include="$(STAGING_DIR)/usr/include/" \
|
|
--with-ldap-lib="$(STAGING_DIR)/usr/lib"
|
|
APR_UTIL_DEPENDENCIES += openldap
|
|
else
|
|
APR_UTIL_CONF_OPTS += --without-ldap
|
|
endif
|
|
|
|
ifeq ($(BR2_PACKAGE_OPENSSL),y)
|
|
APR_UTIL_CONF_OPTS += --with-crypto --with-openssl="$(STAGING_DIR)/usr"
|
|
APR_UTIL_DEPENDENCIES += openssl
|
|
else
|
|
APR_UTIL_CONF_OPTS += --without-crypto
|
|
endif
|
|
|
|
ifeq ($(BR2_PACKAGE_POSTGRESQL),y)
|
|
APR_UTIL_CONF_OPTS += --with-pgsql="$(STAGING_DIR)/usr"
|
|
APR_UTIL_DEPENDENCIES += postgresql
|
|
else
|
|
APR_UTIL_CONF_OPTS += --without-pgsql
|
|
endif
|
|
|
|
ifeq ($(BR2_PACKAGE_UNIXODBC),y)
|
|
APR_UTIL_CONF_OPTS += --with-odbc="$(STAGING_DIR)/usr"
|
|
# avoid using target binary $(STAGING_DIR)/usr/bin/odbc_config
|
|
APR_UTIL_CONF_ENV += ac_cv_path_ODBC_CONFIG=""
|
|
APR_UTIL_DEPENDENCIES += unixodbc
|
|
else
|
|
APR_UTIL_CONF_OPTS += --without-odbc
|
|
endif
|
|
|
|
$(eval $(autotools-package))
|