[oe-commits] Roy Li : php: add a vardeps for configure on sysconfdir

[git at git.openembedded.org]

Module: meta-openembedded.git
Branch: master-next
Commit: bb598402adec8a4c6a36eaa24680bc8744cf7014
URL:    http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=bb598402adec8a4c6a36eaa24680bc8744cf7014

Author: Roy Li <rongqing.li at windriver.com>
Date:   Wed Jun  3 21:11:00 2015 +0800

php: add a vardeps for configure on sysconfdir

Installing target file will fail when sstate is used, since native php is used
to install these files, makefile rule is in php-5.5.24/pear/Makefile.frag
|--------------------------------------
|install-pear-installer: $(SAPI_CLI_PATH)
|	@$(PHP_NATIVE_DIR)/php $(PEAR_INSTALL_FLAGS) $(builddir)/install-pear-nozlib.phar \
|-d "$(peardir)" -b "$(bindir)" ${PEAR_PREFIX} ${PEAR_SUFFIX}
|--------------------------------------
But if sstate is used, native php from sstate has some obsolete path, lead to
that config file is installed into obsolete path.

Other packages fixed this kinds of issue by calling create_wrapper, like
in openssl, rpm; but test show it does not work for php.

only php depends on php-native, so add a vardeps for configure on sysconfdir
to force php-native to build always.

Signed-off-by: Roy Li <rongqing.li at windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>

---

 meta-oe/recipes-devtools/php/php_5.5.24.bb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/meta-oe/recipes-devtools/php/php_5.5.24.bb b/meta-oe/recipes-devtools/php/php_5.5.24.bb
index 81e6c93..1d6769a 100644
--- a/meta-oe/recipes-devtools/php/php_5.5.24.bb
+++ b/meta-oe/recipes-devtools/php/php_5.5.24.bb
@@ -106,6 +106,8 @@ EXTRA_OEMAKE = "INSTALL_ROOT=${D}"
 
 acpaths = ""
 
+do_configure[vardeps] += "${sysconfdir}"
+
 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!'