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/buildconf_fix.patch | 25 ++++++++++++ meta/recipes-support/apr/apr/cleanup.patch | 9 ++--- meta/recipes-support/apr/apr_1.3.3.bb | 37 ------------------ meta/recipes-support/apr/apr_1.4.2.bb | 50 ++++++++++++++++++++++++ 4 files changed, 79 insertions(+), 42 deletions(-) create mode 100644 meta/recipes-support/apr/apr/buildconf_fix.patch delete mode 100644 meta/recipes-support/apr/apr_1.3.3.bb create mode 100644 meta/recipes-support/apr/apr_1.4.2.bb (limited to 'meta/recipes-support/apr') 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 @@ +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 + +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`" 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 diff --git a/meta/recipes-support/apr/apr_1.3.3.bb b/meta/recipes-support/apr/apr_1.3.3.bb deleted file mode 100644 index 26cc01fe7a..0000000000 --- a/meta/recipes-support/apr/apr_1.3.3.bb +++ /dev/null @@ -1,37 +0,0 @@ -DESCRIPTION = "Apache Portable Runtime (APR) library" -SECTION = "libs" -LICENSE = "Apache License, Version 2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=0c35ff3c4c83b89d2f076e315caac28b" -PR = "r5" - -SRC_URI = "${APACHE_MIRROR}/apr/${P}.tar.bz2 \ - file://configure_fixes.patch;patch=1 \ - file://cleanup.patch;patch=1 \ - file://configfix.patch;patch=1" - -SRC_URI[md5sum] = "2090c21dee4f0eb1512604127dcd158f" -SRC_URI[sha256sum] = "d95f3b78366c86317043304864bb08cb836312c87ea7d142a4c02154e7e0dd37" - -inherit autotools lib_package binconfig - -OE_BINCONFIG_EXTRA_MANGLE = " -e 's:location=source:location=installed:'" - -do_configure_prepend() { - cd ${S} - ./buildconf -} - -SYSROOT_PREPROCESS_FUNCS += "apr_sysroot_preprocess" - -apr_sysroot_preprocess () { - d=${SYSROOT_DESTDIR}${STAGING_DIR_TARGET}${datadir}/apr - install -d $d/ - cp ${S}/build/apr_rules.mk $d/ - sed -i s,apr_builddir=.*,apr_builddir=,g $d/apr_rules.mk - sed -i s,apr_builders=.*,apr_builders=,g $d/apr_rules.mk - sed -i s,LIBTOOL=.*,LIBTOOL=\$\(SHELL\)\ ${TARGET_PREFIX}libtool,g $d/apr_rules.mk - sed -i s,\$\(apr_builders\),${STAGING_DATADIR}/apr/,g $d/apr_rules.mk - cp ${S}/build/mkdir.sh $d/ - cp ${S}/build/make_exports.awk $d/ - cp ${S}/build/make_var_export.awk $d/ -} diff --git a/meta/recipes-support/apr/apr_1.4.2.bb b/meta/recipes-support/apr/apr_1.4.2.bb new file mode 100644 index 0000000000..fe983eb7f7 --- /dev/null +++ b/meta/recipes-support/apr/apr_1.4.2.bb @@ -0,0 +1,50 @@ +DESCRIPTION = "Apache Portable Runtime (APR) library" +HOMEPAGE = "http://apr.apache.org/" +SECTION = "libs" + +LICENSE = "Apache License, Version 2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=0c35ff3c4c83b89d2f076e315caac28b \ + file://include/apr_lib.h;endline=17;md5=ee42fa7575dc40580a9e01c1b75fae96" + +PR = "r0" + +SRC_URI = "${APACHE_MIRROR}/apr/${P}.tar.bz2 \ + file://configure_fixes.patch;patch=1 \ + file://cleanup.patch;patch=1 \ + file://configfix.patch;patch=1 \ + file://buildconf_fix.patch;patch=1" + +SRC_URI[md5sum] = "4b00e8f70c067893d075577962656b35" +SRC_URI[sha256sum] = "2017ca700694d09d2b0b21dd7c4d195e43a48735aac88526160c6195ee8f5391" + +inherit autotools lib_package binconfig + +OE_BINCONFIG_EXTRA_MANGLE = " -e 's:location=source:location=installed:'" + +do_configure_prepend() { + cd ${S} + ./buildconf +} + +#for some reason, build/libtool.m4 handled by buildconf still be overwritten +#when autoconf, so handle it again. +do_configure_append() { + cd ${S} + sed -i -e 's/LIBTOOL=\(.*\)top_build/LIBTOOL=\1apr_build/' build/libtool.m4 + sed -i -e 's/LIBTOOL=\(.*\)top_build/LIBTOOL=\1apr_build/' build/apr_rules.mk +} + +SYSROOT_PREPROCESS_FUNCS += "apr_sysroot_preprocess" + +apr_sysroot_preprocess () { + d=${SYSROOT_DESTDIR}${STAGING_DIR_TARGET}${datadir}/apr + install -d $d/ + cp ${S}/build/apr_rules.mk $d/ + sed -i s,apr_builddir=.*,apr_builddir=,g $d/apr_rules.mk + sed -i s,apr_builders=.*,apr_builders=,g $d/apr_rules.mk + sed -i s,LIBTOOL=.*,LIBTOOL=\$\(SHELL\)\ ${TARGET_PREFIX}libtool,g $d/apr_rules.mk + sed -i s,\$\(apr_builders\),${STAGING_DATADIR}/apr/,g $d/apr_rules.mk + cp ${S}/build/mkdir.sh $d/ + cp ${S}/build/make_exports.awk $d/ + cp ${S}/build/make_var_export.awk $d/ +} -- cgit v1.2.3-54-g00ecf