From 13ab18503fd33dd9aa0b560b1f2cbeeb97d5ae12 Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Fri, 10 May 2013 13:53:49 +0100 Subject: apache2: drop unneeded workaround for apr/apr-util config script issue The fix for the apr-1-config/apu-1-config path issue has been in OE-Core for some time now (OE-Core commit ab56f1063a666df5faddd97f44758c8ae378e51c) so we no longer need these workarounds. Signed-off-by: Paul Eggleton --- meta-webserver/recipes-httpd/apache2/apache2_2.4.4.bb | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) (limited to 'meta-webserver/recipes-httpd/apache2') diff --git a/meta-webserver/recipes-httpd/apache2/apache2_2.4.4.bb b/meta-webserver/recipes-httpd/apache2/apache2_2.4.4.bb index 42a7b166ec..cf1e4690e8 100644 --- a/meta-webserver/recipes-httpd/apache2/apache2_2.4.4.bb +++ b/meta-webserver/recipes-httpd/apache2/apache2_2.4.4.bb @@ -31,8 +31,8 @@ CFLAGS_prepend = "-I${STAGING_INCDIR}/openssl " EXTRA_OECONF = "--enable-ssl \ --with-ssl=${STAGING_LIBDIR}/.. \ --with-expat=${STAGING_LIBDIR}/.. \ - --with-apr=${WORKDIR}/apr-1-config \ - --with-apr-util=${WORKDIR}/apu-1-config \ + --with-apr=${STAGING_BINDIR_CROSS}/apr-1-config \ + --with-apr-util=${STAGING_BINDIR_CROSS}/apu-1-config \ --enable-info \ --enable-rewrite \ --with-dbm=sdbm \ @@ -48,15 +48,6 @@ 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 | \ -- cgit 1.2.3-korg