summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support/apr/apr
diff options
context:
space:
mode:
authorZhai Edwin <edwin.zhai@intel.com>2011-07-28 14:33:35 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-08-04 15:04:33 +0100
commitaf415b4d16c65d95a989677abeaa1f28d06b6030 (patch)
treeebdb894731f9ae602e0219a68f8f778ade2a90e2 /meta/recipes-support/apr/apr
parente69dd2f5098895db62e9d61e500f5252e21441a2 (diff)
downloadpoky-af415b4d16c65d95a989677abeaa1f28d06b6030.tar.gz
apr: Upgrade to 1.4.5
Remove buildconf_fix.patch as already in upstream. (From OE-Core rev: e66e0886412b2f1a564babbaa83095c86e5ec65c) Signed-off-by: Zhai Edwin <edwin.zhai@intel.com> Merged with ${BPN} change Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/apr/apr')
-rw-r--r--meta/recipes-support/apr/apr/buildconf_fix.patch27
1 files changed, 0 insertions, 27 deletions
diff --git a/meta/recipes-support/apr/apr/buildconf_fix.patch b/meta/recipes-support/apr/apr/buildconf_fix.patch
deleted file mode 100644
index 2c9d62e7a1..0000000000
--- a/meta/recipes-support/apr/apr/buildconf_fix.patch
+++ /dev/null
@@ -1,27 +0,0 @@
1Remove the new libtool detection method to avoid config failure. Poky's libtool
2has different format for "aclocaldir", and there is no elegant parsing method,
3so fall back to old detection.
4
5Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
6
7Upstream-Status: Inappropriate [configuration]
8
9Index: apr-1.4.2/buildconf
10===================================================================
11--- apr-1.4.2.orig/buildconf 2009-11-13 06:19:49.000000000 +0800
12+++ apr-1.4.2/buildconf 2010-11-29 14:39:19.000000000 +0800
13@@ -50,14 +50,6 @@
14
15 if [ -f libtool.m4 ]; then
16 ltfile=`pwd`/libtool.m4
17-elif grep all_pkgmacro_files $libtoolize > /dev/null; then
18- # libtool 2.x
19- aclocal_dir=`sed -n '/^aclocaldir=/{s/.*=//;p;q;}' < $libtoolize`
20- ltfiles=`sed -n '/^all_pkgmacro_files=/{s/.*=//;;s/"//;p;q;}' < $libtoolize`
21- for f in $ltfiles; do
22- test -f "$aclocal_dir/$f" && cp "$aclocal_dir/$f" build
23- done
24- ltfile=$aclocal_dir/libtool.m4
25 else
26 ltfindcmd="`sed -n \"/=[^\\\`]/p;/libtool_m4=/{s/.*=/echo /p;q;}\" \
27 < $libtoolize`"