From f9ff5ecf55859984d3dbe66378eb7ee54ad28546 Mon Sep 17 00:00:00 2001 From: Zhai Edwin Date: Fri, 30 Dec 2011 10:55:45 +0800 Subject: apr-util: Upgrade to 1.4.1 Signed-off-by: Zhai Edwin --- .../apr/apr-util/configure_fixes.patch | 10 +++-- meta/recipes-support/apr/apr-util_1.3.12.bb | 50 ---------------------- meta/recipes-support/apr/apr-util_1.4.1.bb | 50 ++++++++++++++++++++++ 3 files changed, 56 insertions(+), 54 deletions(-) delete mode 100644 meta/recipes-support/apr/apr-util_1.3.12.bb create mode 100644 meta/recipes-support/apr/apr-util_1.4.1.bb diff --git a/meta/recipes-support/apr/apr-util/configure_fixes.patch b/meta/recipes-support/apr/apr-util/configure_fixes.patch index 19252363ab..91e244ce2c 100644 --- a/meta/recipes-support/apr/apr-util/configure_fixes.patch +++ b/meta/recipes-support/apr/apr-util/configure_fixes.patch @@ -1,10 +1,10 @@ Upstream-Status: Inappropriate [configuration] -Index: apr-util-1.3.4/configure.in +Index: apr-util-1.4.1/configure.in =================================================================== ---- apr-util-1.3.4.orig/configure.in -+++ apr-util-1.3.4/configure.in -@@ -8,14 +8,14 @@ AC_INIT(export_vars.sh.in) +--- apr-util-1.4.1.orig/configure.in 2009-12-18 03:15:19.000000000 +0800 ++++ apr-util-1.4.1/configure.in 2011-12-30 13:32:07.000000000 +0800 +@@ -8,15 +8,15 @@ AC_CONFIG_HEADER(include/private/apu_config.h) AC_CONFIG_AUX_DIR(build) @@ -13,6 +13,7 @@ Index: apr-util-1.3.4/configure.in -sinclude(build/apu-hints.m4) -sinclude(build/apr_common.m4) -sinclude(build/find_apr.m4) +-sinclude(build/crypto.m4) -sinclude(build/dbm.m4) -sinclude(build/dbd.m4) -sinclude(build/dso.m4) @@ -21,6 +22,7 @@ Index: apr-util-1.3.4/configure.in +#sinclude(build/apu-hints.m4) +#sinclude(build/apr_common.m4) +#sinclude(build/find_apr.m4) ++#sinclude(build/crypto.m4) +#sinclude(build/dbm.m4) +#sinclude(build/dbd.m4) +#sinclude(build/dso.m4) diff --git a/meta/recipes-support/apr/apr-util_1.3.12.bb b/meta/recipes-support/apr/apr-util_1.3.12.bb deleted file mode 100644 index 676b1b4efa..0000000000 --- a/meta/recipes-support/apr/apr-util_1.3.12.bb +++ /dev/null @@ -1,50 +0,0 @@ -DESCRIPTION = "Apache Portable Runtime (APR) companion library" -HOMEPAGE = "http://apr.apache.org/" -SECTION = "libs" -DEPENDS = "apr expat gdbm" - -BBCLASSEXTEND = "native" - -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=519e0a18e03f7c023070568c14b077bb \ - file://include/apu_version.h;endline=17;md5=806685a84e71f10c80144c48eb35df42" - -PR = "r2" - -SRC_URI = "${APACHE_MIRROR}/apr/${BPN}-${PV}.tar.gz \ - file://configfix.patch \ - file://configure_fixes.patch" - -SRC_URI[md5sum] = "d1977289889592ef998e3f777f68efe4" -SRC_URI[sha256sum] = "815b6fc82950f61050a5e711a7f3c20fd9b6ffcc7a4cacfe9f291fb241210cd8" - -EXTRA_OECONF = "--with-apr=${STAGING_BINDIR_CROSS}/apr-1-config \ - --without-odbc \ - --without-pgsql \ - --with-dbm=gdbm \ - --with-gdbm=${STAGING_DIR_HOST}${prefix} \ - --without-sqlite2 \ - --without-sqlite3 \ - --with-expat=${STAGING_DIR_HOST}${prefix}" - - -inherit autotools lib_package binconfig - -OE_BINCONFIG_EXTRA_MANGLE = " -e 's:location=source:location=installed:'" - -do_configure_prepend() { - cp ${STAGING_DATADIR}/apr/apr_rules.mk ${S}/build/rules.mk -} -do_configure_prepend_virtclass-native() { - cp ${STAGING_DATADIR_NATIVE}/apr/apr_rules.mk ${S}/build/rules.mk -} -do_configure_append_virtclass-native() { - sed -i "s#LIBTOOL=\$(SHELL) \$(apr_builddir)#LIBTOOL=\$(SHELL) ${STAGING_BINDIR_NATIVE}#" ${S}/build/rules.mk - # sometimes there isn't SHELL - sed -i "s#LIBTOOL=\$(apr_builddir)#LIBTOOL=${STAGING_BINDIR_NATIVE}#" ${S}/build/rules.mk -} - -FILES_${PN} += "${libdir}/apr-util-1/apr_dbm_gdbm-1.so" -FILES_${PN}-dev += "${libdir}/aprutil.exp ${libdir}/apr-util-1/apr_dbm_gdbm.*" -FILES_${PN}-dbg += "${libdir}/apr-util-1/.debug/*" - diff --git a/meta/recipes-support/apr/apr-util_1.4.1.bb b/meta/recipes-support/apr/apr-util_1.4.1.bb new file mode 100644 index 0000000000..d0e19b0a9f --- /dev/null +++ b/meta/recipes-support/apr/apr-util_1.4.1.bb @@ -0,0 +1,50 @@ +DESCRIPTION = "Apache Portable Runtime (APR) companion library" +HOMEPAGE = "http://apr.apache.org/" +SECTION = "libs" +DEPENDS = "apr expat gdbm" + +BBCLASSEXTEND = "native" + +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=519e0a18e03f7c023070568c14b077bb \ + file://include/apu_version.h;endline=17;md5=806685a84e71f10c80144c48eb35df42" + +PR = "r0" + +SRC_URI = "${APACHE_MIRROR}/apr/${BPN}-${PV}.tar.gz \ + file://configfix.patch \ + file://configure_fixes.patch" + +SRC_URI[md5sum] = "666a5d56098a9debf998510e304c8095" +SRC_URI[sha256sum] = "d636d9ef95c6e50e47fc338d532aa375edd11e5d7a3c30dee48beb38ddf4ab4c" + +EXTRA_OECONF = "--with-apr=${STAGING_BINDIR_CROSS}/apr-1-config \ + --without-odbc \ + --without-pgsql \ + --with-dbm=gdbm \ + --with-gdbm=${STAGING_DIR_HOST}${prefix} \ + --without-sqlite2 \ + --without-sqlite3 \ + --with-expat=${STAGING_DIR_HOST}${prefix}" + + +inherit autotools lib_package binconfig + +OE_BINCONFIG_EXTRA_MANGLE = " -e 's:location=source:location=installed:'" + +do_configure_prepend() { + cp ${STAGING_DATADIR}/apr/apr_rules.mk ${S}/build/rules.mk +} +do_configure_prepend_virtclass-native() { + cp ${STAGING_DATADIR_NATIVE}/apr/apr_rules.mk ${S}/build/rules.mk +} +do_configure_append_virtclass-native() { + sed -i "s#LIBTOOL=\$(SHELL) \$(apr_builddir)#LIBTOOL=\$(SHELL) ${STAGING_BINDIR_NATIVE}#" ${S}/build/rules.mk + # sometimes there isn't SHELL + sed -i "s#LIBTOOL=\$(apr_builddir)#LIBTOOL=${STAGING_BINDIR_NATIVE}#" ${S}/build/rules.mk +} + +FILES_${PN} += "${libdir}/apr-util-1/apr_dbm_gdbm-1.so" +FILES_${PN}-dev += "${libdir}/aprutil.exp ${libdir}/apr-util-1/apr_dbm_gdbm.*" +FILES_${PN}-dbg += "${libdir}/apr-util-1/.debug/*" + -- cgit 1.2.3-korg