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>

1 files changed, 0 insertions, 54 deletions

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 2d5edaa9c5..0000000000
--- 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/
-}