From e66e0886412b2f1a564babbaa83095c86e5ec65c Mon Sep 17 00:00:00 2001 From: Zhai Edwin Date: Thu, 28 Jul 2011 14:33:35 +0800 Subject: apr: Upgrade to 1.4.5 Remove buildconf_fix.patch as already in upstream. Signed-off-by: Zhai Edwin Merged with ${BPN} change Signed-off-by: Saul Wold --- meta/recipes-support/apr/apr/buildconf_fix.patch | 27 ------------ meta/recipes-support/apr/apr_1.4.2.bb | 54 ----------------------- meta/recipes-support/apr/apr_1.4.5.bb | 55 ++++++++++++++++++++++++ 3 files changed, 55 insertions(+), 81 deletions(-) delete mode 100644 meta/recipes-support/apr/apr/buildconf_fix.patch delete mode 100644 meta/recipes-support/apr/apr_1.4.2.bb create mode 100644 meta/recipes-support/apr/apr_1.4.5.bb 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 2c9d62e7a..000000000 --- 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 - -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`" diff --git a/meta/recipes-support/apr/apr_1.4.2.bb b/meta/recipes-support/apr/apr_1.4.2.bb deleted file mode 100644 index 2d5edaa9c..000000000 --- a/meta/recipes-support/apr/apr_1.4.2.bb +++ /dev/null @@ -1,54 +0,0 @@ -DESCRIPTION = "Apache Portable Runtime (APR) library" -HOMEPAGE = "http://apr.apache.org/" -SECTION = "libs" - -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=0c35ff3c4c83b89d2f076e315caac28b \ - file://include/apr_lib.h;endline=17;md5=ee42fa7575dc40580a9e01c1b75fae96" - -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" - -SRC_URI[md5sum] = "4b00e8f70c067893d075577962656b35" -SRC_URI[sha256sum] = "2017ca700694d09d2b0b21dd7c4d195e43a48735aac88526160c6195ee8f5391" - -inherit autotools lib_package binconfig multilib_header - -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 -} - -do_install_append() { - oe_multilib_header apr.h -} - -SYSROOT_PREPROCESS_FUNCS += "apr_sysroot_preprocess" - -apr_sysroot_preprocess () { - d=${SYSROOT_DESTDIR}${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.5.bb b/meta/recipes-support/apr/apr_1.4.5.bb new file mode 100644 index 000000000..b65e0427d --- /dev/null +++ b/meta/recipes-support/apr/apr_1.4.5.bb @@ -0,0 +1,55 @@ +DESCRIPTION = "Apache Portable Runtime (APR) library" +HOMEPAGE = "http://apr.apache.org/" +SECTION = "libs" + +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=0c35ff3c4c83b89d2f076e315caac28b \ + file://include/apr_lib.h;endline=17;md5=ee42fa7575dc40580a9e01c1b75fae96" + +PR = "r1" + +SRC_URI = "${APACHE_MIRROR}/apr/${BPN}-${PV}.tar.bz2 \ + file://configure_fixes.patch \ + file://cleanup.patch \ + file://configfix.patch" + +SRC_URI[md5sum] = "8b53f5a5669d0597f2da889a2f576eb6" +SRC_URI[sha256sum] = "38c61cacb39be649411cdab212979c71ce29495549c249c2e9a1b0d12480c93e" + +inherit autotools lib_package binconfig multilib_header + +OE_BINCONFIG_EXTRA_MANGLE = " -e 's:location=source:location=installed:'" + +do_configure_prepend() { + cd ${S} + ./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() { + 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 +} + +do_install_append() { + oe_multilib_header apr.h +} + +SYSROOT_PREPROCESS_FUNCS += "apr_sysroot_preprocess" + +apr_sysroot_preprocess () { + d=${SYSROOT_DESTDIR}${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