diff options
| author | Zhai Edwin <edwin.zhai@intel.com> | 2010-12-17 10:00:20 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-01-20 21:36:57 +0000 |
| commit | aa360877348aa325ff9dcd8fd70e502deacffb39 (patch) | |
| tree | c28c30b710616064d5479f582f32a0f081355672 /meta/recipes-support/apr/apr/cleanup.patch | |
| parent | 552169e89aea5706100a67f1f1e68a85600e1105 (diff) | |
| download | poky-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/apr/apr/cleanup.patch')
| -rw-r--r-- | meta/recipes-support/apr/apr/cleanup.patch | 9 |
1 files changed, 4 insertions, 5 deletions
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 @@ | |||
| 1 | Index: apr-1.3.3/build/buildcheck.sh | 1 | Index: 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 | ||