summaryrefslogtreecommitdiff
path: root/package/apr/patches
diff options
context:
space:
mode:
authorWaldemar Brodkorb <mail@waldemar-brodkorb.de>2012-07-17 17:14:41 +0200
committerWaldemar Brodkorb <mail@waldemar-brodkorb.de>2012-07-17 17:14:41 +0200
commit09fdcb6e5bb6043e66fca16a92f1a9c72340d33c (patch)
tree21b266adcd14d8ed4257d2318a709ea378aac8c0 /package/apr/patches
parent85253eabaf8dc5f58404a918a5d8e05bf54106be (diff)
update to latest upstream version
Diffstat (limited to 'package/apr/patches')
-rw-r--r--package/apr/patches/patch-build_ltmain_sh11
-rw-r--r--package/apr/patches/patch-include_apr_want_h14
2 files changed, 7 insertions, 18 deletions
diff --git a/package/apr/patches/patch-build_ltmain_sh b/package/apr/patches/patch-build_ltmain_sh
deleted file mode 100644
index 0ce8441f6..000000000
--- a/package/apr/patches/patch-build_ltmain_sh
+++ /dev/null
@@ -1,11 +0,0 @@
---- apr-1.4.2.orig/build/ltmain.sh 2010-01-21 08:59:41.000000000 +0100
-+++ apr-1.4.2/build/ltmain.sh 2011-01-14 11:41:48.000000000 +0100
-@@ -4765,7 +4765,7 @@ func_mode_link ()
- # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
- # @file GCC response files
- -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
-- -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
-+ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-fstack-protector*|-flto)
- func_quote_for_eval "$arg"
- arg="$func_quote_for_eval_result"
- func_append compile_command " $arg"
diff --git a/package/apr/patches/patch-include_apr_want_h b/package/apr/patches/patch-include_apr_want_h
index 5f1a11c5e..596a498da 100644
--- a/package/apr/patches/patch-include_apr_want_h
+++ b/package/apr/patches/patch-include_apr_want_h
@@ -1,9 +1,9 @@
---- 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
+--- apr-1.4.6.orig/include/apr_want.h 2011-03-28 07:32:20.000000000 +0200
++++ apr-1.4.6/include/apr_want.h 2012-07-17 10:42:01.000000000 +0200
+@@ -91,11 +91,13 @@
+ #ifndef APR_IOVEC_DEFINED
+ #define APR_IOVEC_DEFINED
+/*
struct iovec
{
@@ -11,6 +11,6 @@
size_t iov_len;
};
+*/
+ #endif /* !APR_IOVEC_DEFINED */
- #endif
-
+ #endif /* APR_HAVE_IOVEC */