From aa360877348aa325ff9dcd8fd70e502deacffb39 Mon Sep 17 00:00:00 2001 From: Zhai Edwin Date: Fri, 17 Dec 2010 10:00:20 +0800 Subject: 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 --- meta/recipes-support/apr/apr/cleanup.patch | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'meta/recipes-support/apr/apr/cleanup.patch') 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 @@ -Index: apr-1.3.3/build/buildcheck.sh +Index: apr-1.4.2/build/buildcheck.sh =================================================================== ---- apr-1.3.3.orig/build/buildcheck.sh 2009-01-15 13:32:33.000000000 +0000 -+++ apr-1.3.3/build/buildcheck.sh 2009-01-15 13:33:06.000000000 +0000 +--- apr-1.4.2.orig/build/buildcheck.sh 2009-11-13 08:27:16.000000000 +0800 ++++ apr-1.4.2/build/buildcheck.sh 2010-11-26 15:44:00.000000000 +0800 @@ -32,35 +32,4 @@ echo "buildconf: autoconf version $ac_version (ok)" fi @@ -12,7 +12,7 @@ Index: apr-1.3.3/build/buildcheck.sh -# output is multiline from 1.5 onwards - -# Require libtool 1.4 or newer --libtool=`build/PrintPath glibtool libtool libtool15 libtool14` +-libtool=`build/PrintPath glibtool1 glibtool libtool libtool15 libtool14` -lt_pversion=`$libtool --version 2>/dev/null|sed -e 's/([^)]*)//g;s/^[^0-9]*//;s/[- ].*//g;q'` -if test -z "$lt_pversion"; then -echo "buildconf: libtool not found." @@ -39,4 +39,3 @@ Index: apr-1.3.3/build/buildcheck.sh - -exit 1 +exit 0 -\ No newline at end of file -- cgit v1.2.3-54-g00ecf