package/php-*: fix autoconf variables

Build of php-* packages are broken since commit
3292f3de499717360cf18d7fecd79ac096216ca8 because
$(HOST_DIR)/bin/auto{conf,header} have been replaced by
$(HOST_DIR)/bin/auto{conf,header} -I "$(ACLOCAL_DIR)" -I "$(ACLOCAL_HOST_DIR)"

So revert this change (which should have been only refactoring) for
those packages

Fixes:
 - http://autobuild.buildroot.org/results/0d5f4a792652e302b8c00c1e0f99966cc930fbac
 - http://autobuild.buildroot.org/results/91a559183db212803a90cb399a1cb505b14818d9

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>

diff --git a/package/php-amqp/php-amqp.mk b/package/php-amqp/php-amqp.mk
index 8f3ba1f9f4190e0adf27a008e5c08773ae723bba..c808ecdbd697c4b8a6eca928d4825684c4c34289 100644 (file)
--- a/package/php-amqp/php-amqp.mk
+++ b/package/php-amqp/php-amqp.mk
@@ -16,8 +16,8 @@ PHP_AMQP_LICENSE_FILES = LICENSE
 
 define PHP_AMQP_PHPIZE
        (cd $(@D); \
-               PHP_AUTOCONF=$(AUTOCONF) \
-               PHP_AUTOHEADER=$(AUTOHEADER) \
+               PHP_AUTOCONF=$(HOST_DIR)/bin/autoconf \
+               PHP_AUTOHEADER=$(HOST_DIR)/bin/autoheader \
                $(STAGING_DIR)/usr/bin/phpize)
 endef
 

diff --git a/package/php-geoip/php-geoip.mk b/package/php-geoip/php-geoip.mk
index 8bff564e2dde6555c94d1dcc9fb5b3221bc7feb3..82ecba5816441536b6c35c6e3ba5493502c357a2 100644 (file)
--- a/package/php-geoip/php-geoip.mk
+++ b/package/php-geoip/php-geoip.mk
@@ -16,8 +16,8 @@ PHP_GEOIP_LICENSE_FILES = geoip.c
 
 define PHP_GEOIP_PHPIZE
        (cd $(@D); \
-               PHP_AUTOCONF=$(AUTOCONF) \
-               PHP_AUTOHEADER=$(AUTOHEADER) \
+               PHP_AUTOCONF=$(HOST_DIR)/bin/autoconf \
+               PHP_AUTOHEADER=$(HOST_DIR)/bin/autoheader \
                $(STAGING_DIR)/usr/bin/phpize)
 endef
 

diff --git a/package/php-gnupg/php-gnupg.mk b/package/php-gnupg/php-gnupg.mk
index 8137da4978a7d76e33fe1cdbde9cf06618fce56e..ae0a781154026923d815e7a58179ed3435d6ca98 100644 (file)
--- a/package/php-gnupg/php-gnupg.mk
+++ b/package/php-gnupg/php-gnupg.mk
@@ -16,8 +16,8 @@ PHP_GNUPG_LICENSE_FILES = LICENSE
 
 define PHP_GNUPG_PHPIZE
        (cd $(@D); \
-               PHP_AUTOCONF=$(AUTOCONF) \
-               PHP_AUTOHEADER=$(AUTOHEADER) \
+               PHP_AUTOCONF=$(HOST_DIR)/bin/autoconf \
+               PHP_AUTOHEADER=$(HOST_DIR)/bin/autoheader \
                $(STAGING_DIR)/usr/bin/phpize)
 endef
 

diff --git a/package/php-imagick/php-imagick.mk b/package/php-imagick/php-imagick.mk
index a5541b003507e471012da891d2d623a22542e27c..ca0cbc7492f033fbb0b476d3daf84adab34524e8 100644 (file)
--- a/package/php-imagick/php-imagick.mk
+++ b/package/php-imagick/php-imagick.mk
@@ -16,8 +16,8 @@ PHP_IMAGICK_LICENSE_FILES = LICENSE
 
 define PHP_IMAGICK_PHPIZE
        (cd $(@D); \
-               PHP_AUTOCONF=$(AUTOCONF) \
-               PHP_AUTOHEADER=$(AUTOHEADER) \
+               PHP_AUTOCONF=$(HOST_DIR)/bin/autoconf \
+               PHP_AUTOHEADER=$(HOST_DIR)/bin/autoheader \
                $(STAGING_DIR)/usr/bin/phpize)
 endef
 

diff --git a/package/php-memcached/php-memcached.mk b/package/php-memcached/php-memcached.mk
index 67ccc6747a5e4d050f3e9c22f0120f13d140812c..4607d099f3d0bdc9cb293a4ba2f261c0d69a7a58 100644 (file)
--- a/package/php-memcached/php-memcached.mk
+++ b/package/php-memcached/php-memcached.mk
@@ -18,8 +18,8 @@ PHP_MEMCACHED_LICENSE_FILES = LICENSE fastlz/LICENSE g_fmt.h
 
 define PHP_MEMCACHED_PHPIZE
        (cd $(@D); \
-               PHP_AUTOCONF=$(AUTOCONF) \
-               PHP_AUTOHEADER=$(AUTOHEADER) \
+               PHP_AUTOCONF=$(HOST_DIR)/bin/autoconf \
+               PHP_AUTOHEADER=$(HOST_DIR)/bin/autoheader \
                $(STAGING_DIR)/usr/bin/phpize)
 endef
 

diff --git a/package/php-ssh2/php-ssh2.mk b/package/php-ssh2/php-ssh2.mk
index 98453acbcf3daed365baedb441a8f8c1e9a7acab..c9c13010dd2b91580d35aa087f965be6b06c8d61 100644 (file)
--- a/package/php-ssh2/php-ssh2.mk
+++ b/package/php-ssh2/php-ssh2.mk
@@ -16,8 +16,8 @@ PHP_SSH2_LICENSE_FILES = LICENSE
 
 define PHP_SSH2_PHPIZE
        (cd $(@D); \
-               PHP_AUTOCONF=$(AUTOCONF) \
-               PHP_AUTOHEADER=$(AUTOHEADER) \
+               PHP_AUTOCONF=$(HOST_DIR)/bin/autoconf \
+               PHP_AUTOHEADER=$(HOST_DIR)/bin/autoheader \
                $(STAGING_DIR)/usr/bin/phpize)
 endef
 

diff --git a/package/php-yaml/php-yaml.mk b/package/php-yaml/php-yaml.mk
index 40f7385c6aa26c52f77fc95e7bdcdccb4251e270..e23d897978664f23fa21d58fe48c38cc138427b3 100644 (file)
--- a/package/php-yaml/php-yaml.mk
+++ b/package/php-yaml/php-yaml.mk
@@ -16,8 +16,8 @@ PHP_YAML_LICENSE_FILES = LICENSE
 
 define PHP_YAML_PHPIZE
        (cd $(@D); \
-               PHP_AUTOCONF=$(AUTOCONF) \
-               PHP_AUTOHEADER=$(AUTOHEADER) \
+               PHP_AUTOCONF=$(HOST_DIR)/bin/autoconf \
+               PHP_AUTOHEADER=$(HOST_DIR)/bin/autoheader \
                $(STAGING_DIR)/usr/bin/phpize)
 endef
 

diff --git a/package/php-zmq/php-zmq.mk b/package/php-zmq/php-zmq.mk
index 892c42130f3882ab70a09d5c65525684a5ff28b5..fed71955b61a6b2a2cee15e963530c929b8684dd 100644 (file)
--- a/package/php-zmq/php-zmq.mk
+++ b/package/php-zmq/php-zmq.mk
@@ -15,8 +15,8 @@ PHP_ZMQ_LICENSE_FILES = LICENSE
 
 define PHP_ZMQ_PHPIZE
        (cd $(@D); \
-               PHP_AUTOCONF=$(AUTOCONF) \
-               PHP_AUTOHEADER=$(AUTOHEADER) \
+               PHP_AUTOCONF=$(HOST_DIR)/bin/autoconf \
+               PHP_AUTOHEADER=$(HOST_DIR)/bin/autoheader \
                $(STAGING_DIR)/usr/bin/phpize)
 endef