84b4c19e55
With per-package directories support enabled, the build of apr-util fails, for two reasons: - The rules.mk file is generated by the 'apr' package, and then copied into the 'apr-util' source directory. This is done by the 'apr-util' build process. Unfortunately, this rules.mk file has a number of hardcoded paths: to the compiler and to the libtool script. Due to this, the compiler from the 'apr' per-package directory gets used. But this compiler uses the 'apr' package sysroot, which does not have all the dependencies of the 'apr-util' package, causing the build to fail because <expat.h> is not found. - Similarly, the libtool script itself has some hardcoded paths, which make it use the compiler/linker from the 'apr' per-package directory, so it does not find the expat library. We fix both issues by doing the necessary replacement in both rules.mk and libtool. Fixes: http://autobuild.buildroot.net/results/2a67b5d58f79348e20a972125e4797eff5585716/ Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
95 lines
2.7 KiB
Makefile
95 lines
2.7 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
|
|
|
|
ifeq ($(BR2_PER_PACKAGE_DIRECTORIES),y)
|
|
define APR_UTIL_FIX_RULES_MK_LIBTOOL
|
|
$(SED) 's,$(PER_PACKAGE_DIR)/apr/,$(PER_PACKAGE_DIR)/apr-util/,g' \
|
|
$(@D)/build/rules.mk
|
|
$(SED) 's,$(PER_PACKAGE_DIR)/apr/,$(PER_PACKAGE_DIR)/apr-util/,g' \
|
|
$(STAGING_DIR)/usr/build-1/libtool
|
|
endef
|
|
APR_UTIL_POST_CONFIGURE_HOOKS += APR_UTIL_FIX_RULES_MK_LIBTOOL
|
|
endif
|
|
|
|
# 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))
|