diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-04-04 10:34:02 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-04-04 10:34:02 +0200 |
| commit | 5042ac8e5927d0089d3902b1c37e5bcc1565d053 (patch) | |
| tree | cd2be3085808c5ac59dd70f9c610c6a40bfe3ffd /package/apr-util | |
| parent | 401dabf66529cfb5ab47b4c78d5e25fd493eef1f (diff) | |
| parent | 4d569ed1a3305c7b7abe8fa4273cea3b559cc85a (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Conflicts:
BUGS
package/autoconf/Makefile
Diffstat (limited to 'package/apr-util')
| -rw-r--r-- | package/apr-util/Config.in | 12 | ||||
| -rw-r--r-- | package/apr-util/Makefile | 4 |
2 files changed, 1 insertions, 15 deletions
diff --git a/package/apr-util/Config.in b/package/apr-util/Config.in deleted file mode 100644 index c691fe035..000000000 --- a/package/apr-util/Config.in +++ /dev/null @@ -1,12 +0,0 @@ -config ADK_PACKAGE_APR_UTIL - prompt "apr-util.......................... Apache Portable Runtime (utils)" - tristate - default n - select ADK_PACKAGE_LIBEXPAT - select ADK_PACKAGE_APR - help - Apache Portable Runtime - - http://apr.apache.org - - diff --git a/package/apr-util/Makefile b/package/apr-util/Makefile index ecc96942f..307853fab 100644 --- a/package/apr-util/Makefile +++ b/package/apr-util/Makefile @@ -10,6 +10,7 @@ PKG_MD5SUM:= dc772ae295f49ddb8ee8e69a9716c53b PKG_DESCR:= Apache Portable Runtime utility library PKG_SECTION:= libs PKG_DEPENDS:= libexpat apr +PKG_BUILDDEP+= expat apr PKG_URL:= http://apr.apache.org PKG_SITES:= http://apache.mirror.clusters.cc/apr/ @@ -17,12 +18,9 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,APR_UTIL,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -CONFIGURE_STYLE:= gnu CONFIGURE_ARGS+= --without-berkeley-db CONFIGURE_ARGS+= --with-apr=${STAGING_DIR}/usr CONFIGURE_ARGS+= --with-expat=${STAGING_DIR}/usr -BUILD_STYLE:= auto -INSTALL_STYLE:= auto XAKE_FLAGS+= apr_builddir=${STAGING_DIR}/usr/share/build \ apr_builders=${STAGING_DIR}/usr/share/build |