2013-06-06 01:53:30 +02:00
|
|
|
################################################################################
|
2012-05-03 14:22:36 +02:00
|
|
|
#
|
|
|
|
# apr-util
|
|
|
|
#
|
2013-06-06 01:53:30 +02:00
|
|
|
################################################################################
|
2013-06-06 01:53:25 +02:00
|
|
|
|
2017-10-30 20:11:02 +01:00
|
|
|
APR_UTIL_VERSION = 1.6.1
|
|
|
|
APR_UTIL_SOURCE = apr-util-$(APR_UTIL_VERSION).tar.bz2
|
2012-05-03 14:22:36 +02:00
|
|
|
APR_UTIL_SITE = http://archive.apache.org/dist/apr
|
2013-03-24 09:19:28 +01:00
|
|
|
APR_UTIL_LICENSE = Apache-2.0
|
|
|
|
APR_UTIL_LICENSE_FILES = LICENSE
|
2012-05-03 14:22:36 +02:00
|
|
|
APR_UTIL_INSTALL_STAGING = YES
|
2014-10-05 19:38:52 +02:00
|
|
|
APR_UTIL_DEPENDENCIES = apr expat
|
2014-09-27 21:32:44 +02:00
|
|
|
APR_UTIL_CONF_OPTS = \
|
2013-03-24 09:19:28 +01:00
|
|
|
--with-apr=$(STAGING_DIR)/usr/bin/apr-1-config
|
|
|
|
APR_UTIL_CONFIG_SCRIPTS = apu-1-config
|
|
|
|
|
package/apr-util: fix build with per-package directories
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>
2020-02-18 00:46:38 +01:00
|
|
|
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
|
|
|
|
|
2013-03-24 09:19:28 +01:00
|
|
|
# When iconv is available, then use it to provide charset conversion
|
|
|
|
# features.
|
2013-03-24 13:48:38 +01:00
|
|
|
APR_UTIL_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBICONV),libiconv)
|
2012-05-03 14:22:36 +02:00
|
|
|
|
2014-10-05 19:38:53 +02:00
|
|
|
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
|
|
|
|
|
2014-10-05 19:38:54 +02:00
|
|
|
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
|
|
|
|
|
2014-10-05 19:38:55 +02:00
|
|
|
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
|
|
|
|
|
2014-10-05 19:38:52 +02:00
|
|
|
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
|
|
|
|
|
2018-05-04 20:26:15 +02:00
|
|
|
ifeq ($(BR2_PACKAGE_OPENLDAP),y)
|
2018-05-09 21:34:16 +02:00
|
|
|
APR_UTIL_CONF_ENV += ac_cv_ldap_set_rebind_proc_style=three
|
2018-05-04 20:26:15 +02:00
|
|
|
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
|
|
|
|
|
2014-10-06 21:32:09 +02:00
|
|
|
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
|
|
|
|
|
2018-05-04 20:26:14 +02:00
|
|
|
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
|
|
|
|
|
2015-03-06 17:49:44 +01:00
|
|
|
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
|
|
|
|
|
2012-07-03 00:07:32 +02:00
|
|
|
$(eval $(autotools-package))
|