From patchwork Thu Oct 11 08:29:22 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [meta-webserver, 1/2] apache2: work around bug in apr-1-config/apu-1-config scripts Date: Thu, 11 Oct 2012 08:29:22 -0000 From: Paul Eggleton X-Patchwork-Id: 38073 Message-Id: To: openembedded-devel@lists.openembedded.org The apr-1-config and apu-1-config scripts (installed into the sysroot by apr and apr-util respectively) report incorrect paths with current OE-Core - see: http://bugzilla.yoctoproject.org/show_bug.cgi?id=3267 Since OE-Core is frozen at the moment, work around the issue by taking a copy of the scripts and fixing them up. Additionally we need to not mangle the libtool name as apr installs it into the sysroot as just 'libtool'. This fixes building apache2 with rm_work enabled. Signed-off-by: Paul Eggleton --- .../recipes-httpd/apache2/apache2_2.4.2.bb | 16 ++++++++++++---- 1 file 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 0eb5327..2c0fa6b 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 | \