[oe-commits] [meta-openembedded] 18/34: php: correct httpd path

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

armin_kuster pushed a commit to branch warrior-next
in repository meta-openembedded.

commit 6f1b1f94e32359c36b023a9217c2ec2e8c5d9cff
Author: Changqing Li <changqing.li at windriver.com>
AuthorDate: Mon May 6 10:14:15 2019 +0800

    php: correct httpd path
    
    Configuration:
    IMAGE_INSTALL_append = " modphp apache2 phpmyadmin xdebug"
    PACKAGECONFIG_append_pn-php = " apache2"
    
    Apache2 service start up with error:
    [php7:crit] [pid 3943:tid 140477147074880] Apache is running a threaded MPM,
    but your PHP Module is not compiled to be threadsafe.
    
    Fix:
    after apache2 is upgraded from 2.4.34 to 2.4.39, apache2-native
    installs httpd into STAGING_SBINDIR_NATIVE, correct it so that
    ZTS feature is open, and php is compiled to be threadsafe.
    
    Signed-off-by: Changqing Li <changqing.li at windriver.com>
    Signed-off-by: Khem Raj <raj.khem at gmail.com>
    Signed-off-by: Armin Kuster <akuster808 at gmail.com>
---
 meta-oe/recipes-devtools/php/php.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-oe/recipes-devtools/php/php.inc b/meta-oe/recipes-devtools/php/php.inc
index 6f893ad..785c2f5 100644
--- a/meta-oe/recipes-devtools/php/php.inc
+++ b/meta-oe/recipes-devtools/php/php.inc
@@ -102,7 +102,7 @@ acpaths = ""
 
 do_configure_prepend () {
     rm -f ${S}/build/libtool.m4 ${S}/ltmain.sh ${S}/aclocal.m4
-    find ${S} -name config.m4 | xargs -n1 sed -i 's!APXS_HTTPD=.*!APXS_HTTPD=${STAGING_BINDIR_NATIVE}/httpd!'
+    find ${S} -name config.m4 | xargs -n1 sed -i 's!APXS_HTTPD=.*!APXS_HTTPD=${STAGING_SBINDIR_NATIVE}/httpd!'
 }
 
 do_configure_append() {

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