diff options
| author | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2013-03-24 08:19:28 +0000 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2013-03-24 20:36:50 +0100 |
| commit | a00fc22779983440d0bec2b996b55f4064079e55 (patch) | |
| tree | ff386d03a2fe2fe73abeb9da6add159f40256dde | |
| parent | a315d073d555a5141337c1860b1c425046a351b5 (diff) | |
| download | buildroot-novena-a00fc22779983440d0bec2b996b55f4064079e55.tar.gz buildroot-novena-a00fc22779983440d0bec2b996b55f4064079e55.zip | |
apr-util: various improvements
This commit:
* Adds licensing informations.
* Uses the apr-1-config script instead of pointing apr-util to the
apr build directory.
* Ensures apu-1-config gets fixed properly using the
<pkg>_CONFIG_SCRIPTS mechanism.
* Ensures that libiconv gets built before apr-util if available, so
that character set conversion features of apr-util can be enabled.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
| -rw-r--r-- | package/apr-util/apr-util.mk | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/package/apr-util/apr-util.mk b/package/apr-util/apr-util.mk index b9ff904c7..94b181724 100644 --- a/package/apr-util/apr-util.mk +++ b/package/apr-util/apr-util.mk @@ -5,9 +5,16 @@ ############################################################# APR_UTIL_VERSION = 1.4.1 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 sqlite neon zlib APR_UTIL_CONF_OPT = \ - --with-apr=$(BUILD_DIR)/apr-$(APR_VERSION) \ + --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) $(eval $(autotools-package)) |