aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKirill Esipov <yesipov@gmail.com>2016-05-13 20:29:34 +0300
committerArmin Kuster <akuster808@gmail.com>2016-08-16 10:29:38 -0700
commitd12c178db918ff5397cdfe3fa8953179f5068150 (patch)
treee5779a76e43714d507e8bc7316a899a533a1e394
parent502695511417cf678555507afecaf1f7c1ddc06c (diff)
downloadmeta-openembedded-contrib-d12c178db918ff5397cdfe3fa8953179f5068150.tar.gz
meta-openembedded-contrib-d12c178db918ff5397cdfe3fa8953179f5068150.tar.bz2
meta-openembedded-contrib-d12c178db918ff5397cdfe3fa8953179f5068150.zip
apache2: fix libtool's path in apxs
libtool-cross recipe install it as ${HOST_SYS}-libtool Signed-off-by: Kirill Esipov <yesipov@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> (cherry picked from commit 33f5a5b43dff271a04b885a74232dcd66b9644fe) Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r--meta-webserver/recipes-httpd/apache2/apache2_2.4.20.bb2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta-webserver/recipes-httpd/apache2/apache2_2.4.20.bb b/meta-webserver/recipes-httpd/apache2/apache2_2.4.20.bb
index 81151d1a47..ae2ec86159 100644
--- a/meta-webserver/recipes-httpd/apache2/apache2_2.4.20.bb
+++ b/meta-webserver/recipes-httpd/apache2/apache2_2.4.20.bb
@@ -116,7 +116,7 @@ apache_sysroot_preprocess () {
install -d ${SYSROOT_DESTDIR}${sbindir}/
install -m 755 ${D}${sbindir}/apachectl ${SYSROOT_DESTDIR}${sbindir}/
sed -i 's!my $installbuilddir = .*!my $installbuilddir = "${STAGING_DIR_HOST}/${datadir}/${BPN}/build";!' ${SYSROOT_DESTDIR}${bindir_crossscripts}/apxs
- sed -i 's!my $libtool = .*!my $libtool = "${STAGING_BINDIR_CROSS}/${TARGET_PREFIX}libtool";!' ${SYSROOT_DESTDIR}${bindir_crossscripts}/apxs
+ sed -i 's!my $libtool = .*!my $libtool = "${STAGING_BINDIR_CROSS}/${HOST_SYS}-libtool";!' ${SYSROOT_DESTDIR}${bindir_crossscripts}/apxs
sed -i 's!^APR_CONFIG = .*!APR_CONFIG = ${STAGING_BINDIR_CROSS}/apr-1-config!' ${SYSROOT_DESTDIR}${datadir}/${BPN}/build/config_vars.mk
sed -i 's!^APU_CONFIG = .*!APU_CONFIG = ${STAGING_BINDIR_CROSS}/apu-1-config!' ${SYSROOT_DESTDIR}${datadir}/${BPN}/build/config_vars.mk