helium-3rd-party/meta-openembedded
1
0
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-08-18 18:50:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

apache2: drop unneeded workaround for apr/apr-util config script issue

Browse Source 
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 <paul.eggleton@linux.intel.com>
This commit is contained in:
Paul Eggleton 2013-05-10 13:53:49 +01:00
parent 3190369ddb
commit 13ab18503f
1 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
meta-webserver/recipes-httpd/apache2/apache2_2.4.4.bb
View File

@ -31,8 +31,8 @@ CFLAGS_prepend = "-I${STAGING_INCDIR}/openssl "
EXTRA_OECONF = "--enable-ssl \ EXTRA_OECONF = "--enable-ssl \
--with-ssl=${STAGING_LIBDIR}/.. \ --with-ssl=${STAGING_LIBDIR}/.. \
--with-expat=${STAGING_LIBDIR}/.. \ --with-expat=${STAGING_LIBDIR}/.. \
--with-apr=${WORKDIR}/apr-1-config \ --with-apr=${STAGING_BINDIR_CROSS}/apr-1-config \
--with-apr-util=${WORKDIR}/apu-1-config \ --with-apr-util=${STAGING_BINDIR_CROSS}/apu-1-config \
--enable-info \ --enable-info \
--enable-rewrite \ --enable-rewrite \
--with-dbm=sdbm \ --with-dbm=sdbm \
@ -48,15 +48,6 @@ EXTRA_OECONF = "--enable-ssl \
--enable-mpms-shared \ --enable-mpms-shared \
ac_cv_have_threadsafe_pollset=no" 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() { do_install_append() {
install -d ${D}/${sysconfdir}/init.d install -d ${D}/${sysconfdir}/init.d
cat ${WORKDIR}/init | \ cat ${WORKDIR}/init | \