diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-06-13 18:06:45 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-06-13 18:06:45 +0200 |
| commit | 8edb1cd5a6a03b391003a1047e0b3ca6d22acd45 (patch) | |
| tree | 751b35f97d8dcc1c9da4f0c81d9707701e8d6710 /package/apr | |
| parent | 92dd4fee15cb7c33868c7d7213f82136955397b1 (diff) | |
bulk package update
Diffstat (limited to 'package/apr')
| -rw-r--r-- | package/apr/Makefile | 27 | ||||
| -rw-r--r-- | package/apr/patches/patch-include_apr_want_h | 16 |
2 files changed, 24 insertions, 19 deletions
diff --git a/package/apr/Makefile b/package/apr/Makefile index 486a96842..4f65c5eef 100644 --- a/package/apr/Makefile +++ b/package/apr/Makefile @@ -4,22 +4,15 @@ include ${TOPDIR}/rules.mk PKG_NAME:= apr -PKG_VERSION:= 0.9.17 +PKG_VERSION:= 1.4.2 PKG_RELEASE:= 1 -PKG_MD5SUM:= ca1e22d98081a03a33c2a0b8684eb192 +PKG_MD5SUM:= fc80cb54f158c2674f9eeb47a1f672cd PKG_DESCR:= Apache Portable Runtime library PKG_SECTION:= libs -ifeq ($(ADK_PACKAGE_APR_THREADING),y) PKG_DEPENDS:= libpthread -PKG_BUILDDEP+= libpthread -endif PKG_URL:= http://apr.apache.org PKG_SITES:= http://gd.tuwien.ac.at/infosys/servers/http/apache/dist/${PKG_NAME}/ -PKG_FLAVOURS= THREADING -PKGFD_FULL= Enable threading support - - include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,APR,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) @@ -31,23 +24,19 @@ CONFIGURE_ENV+= ac_cv_sizeof_ssize_t=4 CONFIGURE_ENV+= ac_cv_file__dev_zero=yes CONFIGURE_ENV+= apr_cv_process_shared_works=no CONFIGURE_ENV+= ac_cv_lib_nsl_gethostbyname=no +CONFIGURE_ENV+= apr_cv_tcp_nodelay_with_cork=no CONFIGURE_ARGS+= --with-devrandom=/dev/urandom - -ifeq (${ADK_PACKAGE_APR_THREADING},y) CONFIGURE_ARGS+= --enable-threads -else -CONFIGURE_ARGS+= --disable-threads -endif post-install: ${INSTALL_DIR} ${IDIR_APR}/usr/lib - ${CP} ${WRKINST}/usr/lib/libapr-0.so* ${IDIR_APR}/usr/lib/ - ${INSTALL_DIR} ${STAGING_DIR}/usr/share/build - ${CP} ${WRKINST}/usr/share/build/* ${STAGING_DIR}/usr/share/build/ + ${CP} ${WRKINST}/usr/lib/libapr-1.so* ${IDIR_APR}/usr/lib/ + ${INSTALL_DIR} ${STAGING_DIR}/usr/share/build-1 + ${CP} ${WRKINST}/usr/share/build-1/* ${STAGING_DIR}/usr/share/build-1/ # we need to patch paths to get apr-util compiling $(SED) "s,\(^installbuilddir=\"\)\(.*\),\1${STAGING_DIR}\2," \ - ${WRKINST}/usr/bin/apr-config + ${WRKINST}/usr/bin/apr-1-config $(SED) "s,\(^datadir=\"\)\(.*\),\1${STAGING_DIR}\2," \ - ${WRKINST}/usr/bin/apr-config + ${WRKINST}/usr/bin/apr-1-config include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/apr/patches/patch-include_apr_want_h b/package/apr/patches/patch-include_apr_want_h new file mode 100644 index 000000000..5f1a11c5e --- /dev/null +++ b/package/apr/patches/patch-include_apr_want_h @@ -0,0 +1,16 @@ +--- apr-1.4.2.orig/include/apr_want.h 2010-01-06 12:36:50.000000000 +0100 ++++ apr-1.4.2/include/apr_want.h 2010-05-29 17:56:14.201613974 +0200 +@@ -89,11 +89,13 @@ + + #else + ++/* + struct iovec + { + void *iov_base; + size_t iov_len; + }; ++*/ + + #endif + |