diff options
| author |   Zhai Edwin <edwin.zhai@intel.com> | 2011-07-28 14:33:35 +0800 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-08-04 15:01:17 +0100 |
| commit | e66e0886412b2f1a564babbaa83095c86e5ec65c (patch) | |
| tree | ff8061af6c9b8286f108c29b480e9402e71c92a4 /meta/recipes-support/apr/apr | |
| parent | deeebb52fd31c6100c140d340ca338d2b62f3ce2 (diff) | |
| download | openembedded-core-contrib-e66e0886412b2f1a564babbaa83095c86e5ec65c.tar.gz | |
apr: Upgrade to 1.4.5
Remove buildconf_fix.patch as already in upstream.
Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
Merged with ${BPN} change
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta/recipes-support/apr/apr')
| -rw-r--r-- | meta/recipes-support/apr/apr/buildconf_fix.patch | 27 |
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 @@ -Remove the new libtool detection method to avoid config failure. Poky's libtool -has different format for "aclocaldir", and there is no elegant parsing method, -so fall back to old detection. - -Signed-off-by: Zhai Edwin <edwin.zhai@intel.com> - -Upstream-Status: Inappropriate [configuration] - -Index: apr-1.4.2/buildconf -=================================================================== ---- apr-1.4.2.orig/buildconf 2009-11-13 06:19:49.000000000 +0800 -+++ apr-1.4.2/buildconf 2010-11-29 14:39:19.000000000 +0800 -@@ -50,14 +50,6 @@ - - if [ -f libtool.m4 ]; then - ltfile=`pwd`/libtool.m4 --elif grep all_pkgmacro_files $libtoolize > /dev/null; then -- # libtool 2.x -- aclocal_dir=`sed -n '/^aclocaldir=/{s/.*=//;p;q;}' < $libtoolize` -- ltfiles=`sed -n '/^all_pkgmacro_files=/{s/.*=//;;s/"//;p;q;}' < $libtoolize` -- for f in $ltfiles; do -- test -f "$aclocal_dir/$f" && cp "$aclocal_dir/$f" build -- done -- ltfile=$aclocal_dir/libtool.m4 - else - ltfindcmd="`sed -n \"/=[^\\\`]/p;/libtool_m4=/{s/.*=/echo /p;q;}\" \ - < $libtoolize`" |