1 files changed, 12 insertions, 4 deletions

diff --git a/meta-webserver/recipes-httpd/apache2/apache2_2.4.2.bb b/meta-webserver/recipes-httpd/apache2/apache2_2.4.2.bb
index 0eb53275c..2c0fa6b92 100644
--- a/meta-webserver/recipes-httpd/apache2/apache2_2.4.2.bb
+++ b/meta-webserver/recipes-httpd/apache2/apache2_2.4.2.bb
@@ -6,11 +6,10 @@ DEPENDS = "libtool-native apache2-native openssl expat pcre apr apr-util"
 RDEPENDS_${PN} += "openssl libgcc"
 SECTION = "net"
 LICENSE = "Apache-2.0"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "http://www.apache.org/dist/httpd/httpd-${PV}.tar.bz2 \
            file://server-makefile.patch \
-           file://fix-libtool-name.patch \
            file://httpd-2.4.1-corelimit.patch \
            file://httpd-2.4.1-export.patch \
            file://httpd-2.4.1-selinux.patch \
@@ -37,8 +36,8 @@ CFLAGS_prepend = "-I${STAGING_INCDIR}/openssl "
 EXTRA_OECONF = "--enable-ssl \
                 --with-ssl=${STAGING_LIBDIR}/.. \
                 --with-expat=${STAGING_LIBDIR}/.. \
-                --with-apr=${STAGING_BINDIR_CROSS}/apr-1-config \
-                --with-apr-util=${STAGING_BINDIR_CROSS}/apu-1-config \
+                --with-apr=${WORKDIR}/apr-1-config \
+                --with-apr-util=${WORKDIR}/apu-1-config \
                 --enable-info \
                 --enable-rewrite \
                 --with-dbm=sdbm \
@@ -54,6 +53,15 @@ EXTRA_OECONF = "--enable-ssl \
                 --enable-mpms-shared \
                 ac_cv_have_threadsafe_pollset=no"
 
+do_configure_prepend() {
+        # FIXME: this hack is required to work around an issue with apr/apr-util
+        # Can be removed when fixed in OE-Core (also revert --with-* options above)
+        # see http://bugzilla.yoctoproject.org/show_bug.cgi?id=3267
+        cp ${STAGING_BINDIR_CROSS}/apr-1-config ${STAGING_BINDIR_CROSS}/apu-1-config ${WORKDIR}
+        sed -i -e 's:location=source:location=installed:' ${WORKDIR}/apr-1-config
+        sed -i -e 's:location=source:location=installed:' ${WORKDIR}/apu-1-config
+}
+
 do_install_append() {
         install -d ${D}/${sysconfdir}/init.d
         cat ${WORKDIR}/init | \