summaryrefslogtreecommitdiff
path: root/package/apr-util
diff options
context:
space:
mode:
Diffstat (limited to 'package/apr-util')
-rw-r--r--package/apr-util/Makefile10
-rw-r--r--package/apr-util/patches/patch-uri_Makefile_in19
-rw-r--r--package/apr-util/patches/uri_delim.patch21
3 files changed, 5 insertions, 45 deletions
diff --git a/package/apr-util/Makefile b/package/apr-util/Makefile
index 307853fab..2c0afd8bf 100644
--- a/package/apr-util/Makefile
+++ b/package/apr-util/Makefile
@@ -4,9 +4,9 @@
include ${TOPDIR}/rules.mk
PKG_NAME:= apr-util
-PKG_VERSION:= 0.9.15
+PKG_VERSION:= 1.3.9
PKG_RELEASE:= 1
-PKG_MD5SUM:= dc772ae295f49ddb8ee8e69a9716c53b
+PKG_MD5SUM:= cc2ec0ba4f01d88375f1170f762518fa
PKG_DESCR:= Apache Portable Runtime utility library
PKG_SECTION:= libs
PKG_DEPENDS:= libexpat apr
@@ -21,11 +21,11 @@ $(eval $(call PKG_template,APR_UTIL,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${
CONFIGURE_ARGS+= --without-berkeley-db
CONFIGURE_ARGS+= --with-apr=${STAGING_DIR}/usr
CONFIGURE_ARGS+= --with-expat=${STAGING_DIR}/usr
-XAKE_FLAGS+= apr_builddir=${STAGING_DIR}/usr/share/build \
- apr_builders=${STAGING_DIR}/usr/share/build
+XAKE_FLAGS+= apr_builddir=${STAGING_DIR}/usr/share/build-1 \
+ apr_builders=${STAGING_DIR}/usr/share/build-1
post-install:
${INSTALL_DIR} ${IDIR_APR_UTIL}/usr/lib
- ${CP} ${WRKINST}/usr/lib/libaprutil-0.so* ${IDIR_APR_UTIL}/usr/lib/
+ ${CP} ${WRKINST}/usr/lib/libaprutil-1.so* ${IDIR_APR_UTIL}/usr/lib/
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/apr-util/patches/patch-uri_Makefile_in b/package/apr-util/patches/patch-uri_Makefile_in
deleted file mode 100644
index 670623ad0..000000000
--- a/package/apr-util/patches/patch-uri_Makefile_in
+++ /dev/null
@@ -1,19 +0,0 @@
-$Id$
---- apr-util-0.9.13.orig/uri/Makefile.in 2004-11-25 00:45:40.000000000 +0100
-+++ apr-util-0.9.13/uri/Makefile.in 2007-02-07 12:55:37.000000000 +0100
-@@ -3,7 +3,7 @@ VPATH = @srcdir@
- INCLUDES = @APRUTIL_PRIV_INCLUDES@ @APR_INCLUDES@ @APRUTIL_INCLUDES@ -I.
-
- TARGETS = uri_delims.h apr_uri.lo
--CLEAN_TARGETS = gen_uri_delims uri_delims.h
-+CLEAN_TARGETS = gen_uri_delims
-
- # bring in rules.mk for standard functionality
- @INCLUDE_RULES@
-@@ -13,6 +13,3 @@ gen_uri_delims: $(gen_uri_delims_OBJECTS
- $(LINK) $(EXTRA_LDFLAGS) $(gen_uri_delims_OBJECTS) $(EXTRA_LIBS)
-
- apr_uri.lo: uri_delims.h apr_uri.c
--
--uri_delims.h: gen_uri_delims
-- ./gen_uri_delims > uri_delims.h
diff --git a/package/apr-util/patches/uri_delim.patch b/package/apr-util/patches/uri_delim.patch
deleted file mode 100644
index 04ca4e1d8..000000000
--- a/package/apr-util/patches/uri_delim.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -Nur apr-util-0.9.13/uri/uri_delims.h build_mipsel/w-apr-util-0.9.13-1/apr-util-0.9.13/uri/uri_delims.h
---- apr-util-0.9.13/uri/uri_delims.h 1970-01-01 01:00:00.000000000 +0100
-+++ build_mipsel/w-apr-util-0.9.13-1/apr-util-0.9.13/uri/uri_delims.h 2007-02-07 13:06:56.000000000 +0100
-@@ -0,0 +1,16 @@
-+/* this file is automatically generated by gen_uri_delims, do not edit */
-+static const unsigned char uri_delims[256] = {
-+ T_NUL,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,T_HASH,0,0,0,0,
-+ 0,0,0,0,0,0,0,T_SLASH,0,0,0,0,0,0,0,0,0,0,T_COLON,0,
-+ 0,0,0,T_QUESTION,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-+};
-