mirror of
https://git.yoctoproject.org/poky
synced 2026-04-20 00:32:13 +02:00
apr: Upgrade to 1.4.5
Remove buildconf_fix.patch as already in upstream. (From OE-Core rev: e66e0886412b2f1a564babbaa83095c86e5ec65c) Signed-off-by: Zhai Edwin <edwin.zhai@intel.com> Merged with ${BPN} change Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
e69dd2f509
commit
af415b4d16
@@ -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`"
|
||||
@@ -9,13 +9,12 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=0c35ff3c4c83b89d2f076e315caac28b \
|
||||
PR = "r1"
|
||||
|
||||
SRC_URI = "${APACHE_MIRROR}/apr/${BPN}-${PV}.tar.bz2 \
|
||||
file://configure_fixes.patch;patch=1 \
|
||||
file://cleanup.patch;patch=1 \
|
||||
file://configfix.patch;patch=1 \
|
||||
file://buildconf_fix.patch;patch=1"
|
||||
file://configure_fixes.patch \
|
||||
file://cleanup.patch \
|
||||
file://configfix.patch"
|
||||
|
||||
SRC_URI[md5sum] = "4b00e8f70c067893d075577962656b35"
|
||||
SRC_URI[sha256sum] = "2017ca700694d09d2b0b21dd7c4d195e43a48735aac88526160c6195ee8f5391"
|
||||
SRC_URI[md5sum] = "8b53f5a5669d0597f2da889a2f576eb6"
|
||||
SRC_URI[sha256sum] = "38c61cacb39be649411cdab212979c71ce29495549c249c2e9a1b0d12480c93e"
|
||||
|
||||
inherit autotools lib_package binconfig multilib_header
|
||||
|
||||
@@ -26,6 +25,8 @@ do_configure_prepend() {
|
||||
./buildconf
|
||||
}
|
||||
|
||||
FILES_${PN}-dev += "${libdir}/apr.exp ${datadir}/build-1/*"
|
||||
|
||||
#for some reason, build/libtool.m4 handled by buildconf still be overwritten
|
||||
#when autoconf, so handle it again.
|
||||
do_configure_append() {
|
||||
Reference in New Issue
Block a user