summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--package/apr/0001-cross-compile.patch6
-rw-r--r--package/apr/apr.hash4
-rw-r--r--package/apr/apr.mk3
3 files changed, 7 insertions, 6 deletions
diff --git a/package/apr/0001-cross-compile.patch b/package/apr/0001-cross-compile.patch
index 5b596fb20f..559ebb74ba 100644
--- a/package/apr/0001-cross-compile.patch
+++ b/package/apr/0001-cross-compile.patch
@@ -42,10 +42,10 @@ diff -uNr apr-1.5.1.org/Makefile.in apr-1.5.1/Makefile.in
# get substituted into some targets
APR_MAJOR_VERSION=@APR_MAJOR_VERSION@
-@@ -134,8 +136,13 @@
+@@ -134,8 +134,13 @@
+ $(APR_MKDIR) tools
+ $(LT_COMPILE)
- OBJECTS_gen_test_char = tools/gen_test_char.lo $(LOCAL_LIBS)
- tools/gen_test_char.lo: make_tools_dir
+ifdef CC_FOR_BUILD
+tools/gen_test_char@EXEEXT@: tools/gen_test_char.c $(LOCAL_LIBS)
+ $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) -DCROSS_COMPILE -o $@ $<
diff --git a/package/apr/apr.hash b/package/apr/apr.hash
index 50d657a8cb..917ce56272 100644
--- a/package/apr/apr.hash
+++ b/package/apr/apr.hash
@@ -1,2 +1,2 @@
-# From http://archive.apache.org/dist/apr/apr-1.5.1.tar.gz.sha1
-sha1 9caa83e3f50f3abc9fab7c4a3f2739a12b14c3a3 apr-1.5.1.tar.gz
+# From http://archive.apache.org/dist/apr/apr-1.5.2.tar.bz2.sha1
+sha1 6d757fcf7c687fc300c1066076f2e8380ff8cbc0 apr-1.5.2.tar.bz2
diff --git a/package/apr/apr.mk b/package/apr/apr.mk
index f09f94368c..4a97f7e65e 100644
--- a/package/apr/apr.mk
+++ b/package/apr/apr.mk
@@ -4,7 +4,8 @@
#
################################################################################
-APR_VERSION = 1.5.1
+APR_VERSION = 1.5.2
+APR_SOURCE = apr-$(APR_VERSION).tar.bz2
APR_SITE = http://archive.apache.org/dist/apr
APR_LICENSE = Apache-2.0
APR_LICENSE_FILES = LICENSE
OpenPOWER on IntegriCloud