[oe-commits] [meta-openembedded] 06/60: apache2: fix libtool's path in apxs

[git at git.openembedded.org]

martin_jansa pushed a commit to branch krogoth-next
in repository meta-openembedded.

commit d12c178db918ff5397cdfe3fa8953179f5068150
Author: Kirill Esipov <yesipov at gmail.com>
AuthorDate: Fri May 13 20:29:34 2016 +0300

    apache2: fix libtool's path in apxs
    
    libtool-cross recipe install it as ${HOST_SYS}-libtool
    
    Signed-off-by: Kirill Esipov <yesipov at gmail.com>
    Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
    (cherry picked from commit 33f5a5b43dff271a04b885a74232dcd66b9644fe)
    Signed-off-by: Armin Kuster <akuster808 at gmail.com>
---
 meta-webserver/recipes-httpd/apache2/apache2_2.4.20.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 81151d1..ae2ec86 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

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.