summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support
diff options
context:
space:
mode:
authorZhai Edwin <edwin.zhai@intel.com>2010-12-17 10:00:20 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-01-20 21:36:57 +0000
commitaa360877348aa325ff9dcd8fd70e502deacffb39 (patch)
treec28c30b710616064d5479f582f32a0f081355672 /meta/recipes-support
parent552169e89aea5706100a67f1f1e68a85600e1105 (diff)
downloadpoky-aa360877348aa325ff9dcd8fd70e502deacffb39.tar.gz
apr: Update to 1.4.2
Add buildconf_fix.patch of removing new libtool detection method to avoid config failure. Handled build/libtool.m4 & apr_rules.mk after configure to take place of "top_builddir" by "apr_builddir", as these files would be reused by apr-util. Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
Diffstat (limited to 'meta/recipes-support')
-rw-r--r--meta/recipes-support/apr/apr/buildconf_fix.patch25
-rw-r--r--meta/recipes-support/apr/apr/cleanup.patch9
-rw-r--r--meta/recipes-support/apr/apr_1.4.2.bb (renamed from meta/recipes-support/apr/apr_1.3.3.bb)23
3 files changed, 47 insertions, 10 deletions
diff --git a/meta/recipes-support/apr/apr/buildconf_fix.patch b/meta/recipes-support/apr/apr/buildconf_fix.patch
new file mode 100644
index 0000000000..641340b2a4
--- /dev/null
+++ b/meta/recipes-support/apr/apr/buildconf_fix.patch
@@ -0,0 +1,25 @@
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
7Index: apr-1.4.2/buildconf
8===================================================================
9--- apr-1.4.2.orig/buildconf 2009-11-13 06:19:49.000000000 +0800
10+++ apr-1.4.2/buildconf 2010-11-29 14:39:19.000000000 +0800
11@@ -50,14 +50,6 @@
12
13 if [ -f libtool.m4 ]; then
14 ltfile=`pwd`/libtool.m4
15-elif grep all_pkgmacro_files $libtoolize > /dev/null; then
16- # libtool 2.x
17- aclocal_dir=`sed -n '/^aclocaldir=/{s/.*=//;p;q;}' < $libtoolize`
18- ltfiles=`sed -n '/^all_pkgmacro_files=/{s/.*=//;;s/"//;p;q;}' < $libtoolize`
19- for f in $ltfiles; do
20- test -f "$aclocal_dir/$f" && cp "$aclocal_dir/$f" build
21- done
22- ltfile=$aclocal_dir/libtool.m4
23 else
24 ltfindcmd="`sed -n \"/=[^\\\`]/p;/libtool_m4=/{s/.*=/echo /p;q;}\" \
25 < $libtoolize`"
diff --git a/meta/recipes-support/apr/apr/cleanup.patch b/meta/recipes-support/apr/apr/cleanup.patch
index fd74826480..47f1c42c5c 100644
--- a/meta/recipes-support/apr/apr/cleanup.patch
+++ b/meta/recipes-support/apr/apr/cleanup.patch
@@ -1,7 +1,7 @@
1Index: apr-1.3.3/build/buildcheck.sh 1Index: apr-1.4.2/build/buildcheck.sh
2=================================================================== 2===================================================================
3--- apr-1.3.3.orig/build/buildcheck.sh 2009-01-15 13:32:33.000000000 +0000 3--- apr-1.4.2.orig/build/buildcheck.sh 2009-11-13 08:27:16.000000000 +0800
4+++ apr-1.3.3/build/buildcheck.sh 2009-01-15 13:33:06.000000000 +0000 4+++ apr-1.4.2/build/buildcheck.sh 2010-11-26 15:44:00.000000000 +0800
5@@ -32,35 +32,4 @@ 5@@ -32,35 +32,4 @@
6 echo "buildconf: autoconf version $ac_version (ok)" 6 echo "buildconf: autoconf version $ac_version (ok)"
7 fi 7 fi
@@ -12,7 +12,7 @@ Index: apr-1.3.3/build/buildcheck.sh
12-# output is multiline from 1.5 onwards 12-# output is multiline from 1.5 onwards
13- 13-
14-# Require libtool 1.4 or newer 14-# Require libtool 1.4 or newer
15-libtool=`build/PrintPath glibtool libtool libtool15 libtool14` 15-libtool=`build/PrintPath glibtool1 glibtool libtool libtool15 libtool14`
16-lt_pversion=`$libtool --version 2>/dev/null|sed -e 's/([^)]*)//g;s/^[^0-9]*//;s/[- ].*//g;q'` 16-lt_pversion=`$libtool --version 2>/dev/null|sed -e 's/([^)]*)//g;s/^[^0-9]*//;s/[- ].*//g;q'`
17-if test -z "$lt_pversion"; then 17-if test -z "$lt_pversion"; then
18-echo "buildconf: libtool not found." 18-echo "buildconf: libtool not found."
@@ -39,4 +39,3 @@ Index: apr-1.3.3/build/buildcheck.sh
39- 39-
40-exit 1 40-exit 1
41+exit 0 41+exit 0
42\ No newline at end of file
diff --git a/meta/recipes-support/apr/apr_1.3.3.bb b/meta/recipes-support/apr/apr_1.4.2.bb
index 26cc01fe7a..fe983eb7f7 100644
--- a/meta/recipes-support/apr/apr_1.3.3.bb
+++ b/meta/recipes-support/apr/apr_1.4.2.bb
@@ -1,16 +1,21 @@
1DESCRIPTION = "Apache Portable Runtime (APR) library" 1DESCRIPTION = "Apache Portable Runtime (APR) library"
2HOMEPAGE = "http://apr.apache.org/"
2SECTION = "libs" 3SECTION = "libs"
4
3LICENSE = "Apache License, Version 2.0" 5LICENSE = "Apache License, Version 2.0"
4LIC_FILES_CHKSUM = "file://LICENSE;md5=0c35ff3c4c83b89d2f076e315caac28b" 6LIC_FILES_CHKSUM = "file://LICENSE;md5=0c35ff3c4c83b89d2f076e315caac28b \
5PR = "r5" 7 file://include/apr_lib.h;endline=17;md5=ee42fa7575dc40580a9e01c1b75fae96"
8
9PR = "r0"
6 10
7SRC_URI = "${APACHE_MIRROR}/apr/${P}.tar.bz2 \ 11SRC_URI = "${APACHE_MIRROR}/apr/${P}.tar.bz2 \
8 file://configure_fixes.patch;patch=1 \ 12 file://configure_fixes.patch;patch=1 \
9 file://cleanup.patch;patch=1 \ 13 file://cleanup.patch;patch=1 \
10 file://configfix.patch;patch=1" 14 file://configfix.patch;patch=1 \
15 file://buildconf_fix.patch;patch=1"
11 16
12SRC_URI[md5sum] = "2090c21dee4f0eb1512604127dcd158f" 17SRC_URI[md5sum] = "4b00e8f70c067893d075577962656b35"
13SRC_URI[sha256sum] = "d95f3b78366c86317043304864bb08cb836312c87ea7d142a4c02154e7e0dd37" 18SRC_URI[sha256sum] = "2017ca700694d09d2b0b21dd7c4d195e43a48735aac88526160c6195ee8f5391"
14 19
15inherit autotools lib_package binconfig 20inherit autotools lib_package binconfig
16 21
@@ -21,6 +26,14 @@ do_configure_prepend() {
21 ./buildconf 26 ./buildconf
22} 27}
23 28
29#for some reason, build/libtool.m4 handled by buildconf still be overwritten
30#when autoconf, so handle it again.
31do_configure_append() {
32 cd ${S}
33 sed -i -e 's/LIBTOOL=\(.*\)top_build/LIBTOOL=\1apr_build/' build/libtool.m4
34 sed -i -e 's/LIBTOOL=\(.*\)top_build/LIBTOOL=\1apr_build/' build/apr_rules.mk
35}
36
24SYSROOT_PREPROCESS_FUNCS += "apr_sysroot_preprocess" 37SYSROOT_PREPROCESS_FUNCS += "apr_sysroot_preprocess"
25 38
26apr_sysroot_preprocess () { 39apr_sysroot_preprocess () {