summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-support/apr/apr/buildconf_fix.patch27
-rw-r--r--meta/recipes-support/apr/apr_1.4.5.bb (renamed from meta/recipes-support/apr/apr_1.4.2.bb)13
2 files changed, 7 insertions, 33 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`"
diff --git a/meta/recipes-support/apr/apr_1.4.2.bb b/meta/recipes-support/apr/apr_1.4.5.bb
index 2d5edaa9c5..b65e0427da 100644
--- a/meta/recipes-support/apr/apr_1.4.2.bb
+++ b/meta/recipes-support/apr/apr_1.4.5.bb
@@ -9,13 +9,12 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=0c35ff3c4c83b89d2f076e315caac28b \
9PR = "r1" 9PR = "r1"
10 10
11SRC_URI = "${APACHE_MIRROR}/apr/${BPN}-${PV}.tar.bz2 \ 11SRC_URI = "${APACHE_MIRROR}/apr/${BPN}-${PV}.tar.bz2 \
12 file://configure_fixes.patch;patch=1 \ 12 file://configure_fixes.patch \
13 file://cleanup.patch;patch=1 \ 13 file://cleanup.patch \
14 file://configfix.patch;patch=1 \ 14 file://configfix.patch"
15 file://buildconf_fix.patch;patch=1"
16 15
17SRC_URI[md5sum] = "4b00e8f70c067893d075577962656b35" 16SRC_URI[md5sum] = "8b53f5a5669d0597f2da889a2f576eb6"
18SRC_URI[sha256sum] = "2017ca700694d09d2b0b21dd7c4d195e43a48735aac88526160c6195ee8f5391" 17SRC_URI[sha256sum] = "38c61cacb39be649411cdab212979c71ce29495549c249c2e9a1b0d12480c93e"
19 18
20inherit autotools lib_package binconfig multilib_header 19inherit autotools lib_package binconfig multilib_header
21 20
@@ -26,6 +25,8 @@ do_configure_prepend() {
26 ./buildconf 25 ./buildconf
27} 26}
28 27
28FILES_${PN}-dev += "${libdir}/apr.exp ${datadir}/build-1/*"
29
29#for some reason, build/libtool.m4 handled by buildconf still be overwritten 30#for some reason, build/libtool.m4 handled by buildconf still be overwritten
30#when autoconf, so handle it again. 31#when autoconf, so handle it again.
31do_configure_append() { 32do_configure_append() {