diff options
| author | heil <heil@terminal-consulting.de> | 2015-05-04 17:53:27 +0200 |
|---|---|---|
| committer | heil <heil@terminal-consulting.de> | 2015-05-04 17:53:27 +0200 |
| commit | 7c331284e0980efbfd6d7b2d7463d62feabb3fe6 (patch) | |
| tree | 960ced6394ef74db84dce1fc794d98371f2cfe06 /libs/apr | |
| parent | 26d577ac2607a37ba0dbd4c07824536d431d3ef6 (diff) | |
apr: upgrade to 1.5.4
Signed-off-by: heil <heil@terminal-consulting.de>
Diffstat (limited to 'libs/apr')
| -rw-r--r-- | libs/apr/Makefile | 4 | ||||
| -rw-r--r-- | libs/apr/patches/001-autoconf-compat.patch | 14 | ||||
| -rw-r--r-- | libs/apr/patches/201-upgrade-and-fix-1.5.1.patch | 21 |
3 files changed, 20 insertions, 19 deletions
diff --git a/libs/apr/Makefile b/libs/apr/Makefile index 69f5b5fd9..924db85b4 100644 --- a/libs/apr/Makefile +++ b/libs/apr/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=apr -PKG_VERSION:=1.5.1 +PKG_VERSION:=1.5.2 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=http://mirrors.ibiblio.org/apache/apr/ -PKG_MD5SUM:=5486180ec5a23efb5cae6d4292b300ab +PKG_MD5SUM:=4e9769f3349fe11fc0a5e1b224c236aa PKG_MAINTAINER:=Thomas Heil <heil@terminal-consulting.de> PKG_LICENSE:=Apache License diff --git a/libs/apr/patches/001-autoconf-compat.patch b/libs/apr/patches/001-autoconf-compat.patch index 8170572bc..acc94fc3f 100644 --- a/libs/apr/patches/001-autoconf-compat.patch +++ b/libs/apr/patches/001-autoconf-compat.patch @@ -1,5 +1,7 @@ ---- a/Makefile.in -+++ b/Makefile.in +Index: apr-1.5.2/Makefile.in +=================================================================== +--- apr-1.5.2.orig/Makefile.in ++++ apr-1.5.2/Makefile.in @@ -3,6 +3,7 @@ srcdir=@srcdir@ VPATH=@srcdir@ top_srcdir=@apr_srcdir@ @@ -8,9 +10,11 @@ # # APR (Apache Portable Runtime) library Makefile. ---- a/configure.in -+++ b/configure.in -@@ -246,9 +246,6 @@ case $host in +Index: apr-1.5.2/configure.in +=================================================================== +--- apr-1.5.2.orig/configure.in ++++ apr-1.5.2/configure.in +@@ -245,9 +245,6 @@ case $host in gcc $CFLAGS $CPPFLAGS -o $LIBTOOL.exe $LIBTOOL.c ;; *) diff --git a/libs/apr/patches/201-upgrade-and-fix-1.5.1.patch b/libs/apr/patches/201-upgrade-and-fix-1.5.1.patch index 42f4c0f03..87cd546d1 100644 --- a/libs/apr/patches/201-upgrade-and-fix-1.5.1.patch +++ b/libs/apr/patches/201-upgrade-and-fix-1.5.1.patch @@ -15,10 +15,10 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Makefile.in | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) -Index: apr-1.5.1/Makefile.in +Index: apr-1.5.2/Makefile.in =================================================================== ---- apr-1.5.1.orig/Makefile.in -+++ apr-1.5.1/Makefile.in +--- apr-1.5.2.orig/Makefile.in ++++ apr-1.5.2/Makefile.in @@ -20,7 +20,7 @@ INCDIR=./include OSDIR=$(top_srcdir)/include/arch/@OSDIR@ DEFOSDIR=$(INCDIR)/arch/@DEFAULT_OSDIR@ @@ -36,19 +36,16 @@ Index: apr-1.5.1/Makefile.in include/private/apr_escape_test_char.h DISTCLEAN_TARGETS = config.cache config.log config.status \ include/apr.h include/arch/unix/apr_private.h \ -@@ -130,13 +129,8 @@ check: $(TARGET_LIB) - etags: - etags `find . -name '*.[ch]'` +@@ -135,9 +134,9 @@ tools/gen_test_char.lo: tools/gen_test_c + $(APR_MKDIR) tools + $(LT_COMPILE) --make_tools_dir: -- $(APR_MKDIR) tools -- --OBJECTS_gen_test_char = tools/gen_test_char.lo $(LOCAL_LIBS) --tools/gen_test_char.lo: make_tools_dir -tools/gen_test_char@EXEEXT@: $(OBJECTS_gen_test_char) - $(LINK_PROG) $(OBJECTS_gen_test_char) $(ALL_LIBS) +- +tools/gen_test_char@EXEEXT@: tools/gen_test_char.c + $(BUILDCC) $(CFLAGS_FOR_BUILD) $< -o $@ - ++ include/private/apr_escape_test_char.h: tools/gen_test_char@EXEEXT@ $(APR_MKDIR) include/private + tools/gen_test_char@EXEEXT@ > $@ |