Skip to contentSkip to conversation

package: use variables defined by autoconf.mk

PATCH New Nicolas Carrier 4 participants 7 messages Oct 25, 2019 – Sep 3, 2020

lore
Share & tools
lore
#0 lore raw

PATCH v4 1/2 package: use variables defined by autoconf.mk

autoconf.mk defines AUTOCONF and AUTOHEADER variables, use them in packages using autoconf.
This is a refactoring which shouldn't impact the final behavior.

---
 package/cups/cups.mk                   | 2 +-
 package/libxmlrpc/libxmlrpc.mk         | 2 +-
 package/ncftp/ncftp.mk                 | 2 +-
 package/php-amqp/php-amqp.mk           | 4 ++--
 package/php-geoip/php-geoip.mk         | 4 ++--
 package/php-gnupg/php-gnupg.mk         | 4 ++--
 package/php-imagick/php-imagick.mk     | 4 ++--
 package/php-memcached/php-memcached.mk | 4 ++--
 package/php-ssh2/php-ssh2.mk           | 4 ++--
 package/php-yaml/php-yaml.mk           | 4 ++--
 package/php-zmq/php-zmq.mk             | 4 ++--
 package/socat/socat.mk                 | 2 +-
 12 files changed, 20 insertions(+), 20 deletions(-)
package/cups/cups.mk +1 -1
index bc2913b428..b30fd78b9f 100644
@@ -13,7 +13,7 @@ CUPS_INSTALL_STAGING = YES
 
 # Using autoconf, not autoheader, so we cannot use AUTORECONF = YES.
 define CUPS_RUN_AUTOCONF
-	cd $(@D); $(HOST_DIR)/bin/autoconf -f
+	cd $(@D); $(AUTOCONF) -f
 endef
 CUPS_PRE_CONFIGURE_HOOKS += CUPS_RUN_AUTOCONF
 
package/libxmlrpc/libxmlrpc.mk +1 -1
index 90791bd671..54db9f1f89 100644
@@ -16,7 +16,7 @@ LIBXMLRPC_MAKE = $(MAKE1)
 
 # Using autoconf, not automake, so we cannot use AUTORECONF = YES.
 define LIBXMLRPC_RUN_AUTOCONF
-	cd $(@D); $(HOST_DIR)/bin/autoconf
+	cd $(@D); $(AUTOCONF)
 endef
 
 LIBXMLRPC_PRE_CONFIGURE_HOOKS += LIBXMLRPC_RUN_AUTOCONF
package/ncftp/ncftp.mk +1 -1
index c8c8942333..676a9c5895 100644
@@ -21,7 +21,7 @@ NCFTP_CONF_OPTS = --disable-ccdv
 # We need to pass -I because of the non-standard m4 directory name, and
 # none of the other autotools are used, so the below is the easiest.
 define NCFTP_RUN_AUTOCONF
-	(cd $(@D); $(HOST_DIR)/bin/autoconf -I$(@D)/autoconf_local/)
+	(cd $(@D); $(AUTOCONF) -I$(@D)/autoconf_local/)
 endef
 NCFTP_PRE_CONFIGURE_HOOKS += NCFTP_RUN_AUTOCONF
 
package/php-amqp/php-amqp.mk +2 -2
index c808ecdbd6..8f3ba1f9f4 100644
@@ -16,8 +16,8 @@ PHP_AMQP_LICENSE_FILES = LICENSE
 
 define PHP_AMQP_PHPIZE
 	(cd $(@D); \
-		PHP_AUTOCONF=$(HOST_DIR)/bin/autoconf \
-		PHP_AUTOHEADER=$(HOST_DIR)/bin/autoheader \
+		PHP_AUTOCONF=$(AUTOCONF) \
+		PHP_AUTOHEADER=$(AUTOHEADER) \
 		$(STAGING_DIR)/usr/bin/phpize)
 endef
 
package/php-geoip/php-geoip.mk +2 -2
index 82ecba5816..8bff564e2d 100644
@@ -16,8 +16,8 @@ PHP_GEOIP_LICENSE_FILES = geoip.c
 
 define PHP_GEOIP_PHPIZE
 	(cd $(@D); \
-		PHP_AUTOCONF=$(HOST_DIR)/bin/autoconf \
-		PHP_AUTOHEADER=$(HOST_DIR)/bin/autoheader \
+		PHP_AUTOCONF=$(AUTOCONF) \
+		PHP_AUTOHEADER=$(AUTOHEADER) \
 		$(STAGING_DIR)/usr/bin/phpize)
 endef
 
package/php-gnupg/php-gnupg.mk +2 -2
index ae0a781154..8137da4978 100644
@@ -16,8 +16,8 @@ PHP_GNUPG_LICENSE_FILES = LICENSE
 
 define PHP_GNUPG_PHPIZE
 	(cd $(@D); \
-		PHP_AUTOCONF=$(HOST_DIR)/bin/autoconf \
-		PHP_AUTOHEADER=$(HOST_DIR)/bin/autoheader \
+		PHP_AUTOCONF=$(AUTOCONF) \
+		PHP_AUTOHEADER=$(AUTOHEADER) \
 		$(STAGING_DIR)/usr/bin/phpize)
 endef
 
package/php-imagick/php-imagick.mk +2 -2
index ca0cbc7492..a5541b0035 100644
@@ -16,8 +16,8 @@ PHP_IMAGICK_LICENSE_FILES = LICENSE
 
 define PHP_IMAGICK_PHPIZE
 	(cd $(@D); \
-		PHP_AUTOCONF=$(HOST_DIR)/bin/autoconf \
-		PHP_AUTOHEADER=$(HOST_DIR)/bin/autoheader \
+		PHP_AUTOCONF=$(AUTOCONF) \
+		PHP_AUTOHEADER=$(AUTOHEADER) \
 		$(STAGING_DIR)/usr/bin/phpize)
 endef
 
package/php-memcached/php-memcached.mk +2 -2
index 4607d099f3..67ccc6747a 100644
@@ -18,8 +18,8 @@ PHP_MEMCACHED_LICENSE_FILES = LICENSE fastlz/LICENSE g_fmt.h
 
 define PHP_MEMCACHED_PHPIZE
 	(cd $(@D); \
-		PHP_AUTOCONF=$(HOST_DIR)/bin/autoconf \
-		PHP_AUTOHEADER=$(HOST_DIR)/bin/autoheader \
+		PHP_AUTOCONF=$(AUTOCONF) \
+		PHP_AUTOHEADER=$(AUTOHEADER) \
 		$(STAGING_DIR)/usr/bin/phpize)
 endef
 
package/php-ssh2/php-ssh2.mk +2 -2
index c9c13010dd..98453acbcf 100644
@@ -16,8 +16,8 @@ PHP_SSH2_LICENSE_FILES = LICENSE
 
 define PHP_SSH2_PHPIZE
 	(cd $(@D); \
-		PHP_AUTOCONF=$(HOST_DIR)/bin/autoconf \
-		PHP_AUTOHEADER=$(HOST_DIR)/bin/autoheader \
+		PHP_AUTOCONF=$(AUTOCONF) \
+		PHP_AUTOHEADER=$(AUTOHEADER) \
 		$(STAGING_DIR)/usr/bin/phpize)
 endef
 
package/php-yaml/php-yaml.mk +2 -2
index e23d897978..40f7385c6a 100644
@@ -16,8 +16,8 @@ PHP_YAML_LICENSE_FILES = LICENSE
 
 define PHP_YAML_PHPIZE
 	(cd $(@D); \
-		PHP_AUTOCONF=$(HOST_DIR)/bin/autoconf \
-		PHP_AUTOHEADER=$(HOST_DIR)/bin/autoheader \
+		PHP_AUTOCONF=$(AUTOCONF) \
+		PHP_AUTOHEADER=$(AUTOHEADER) \
 		$(STAGING_DIR)/usr/bin/phpize)
 endef
 
package/php-zmq/php-zmq.mk +2 -2
index fed71955b6..892c42130f 100644
@@ -15,8 +15,8 @@ PHP_ZMQ_LICENSE_FILES = LICENSE
 
 define PHP_ZMQ_PHPIZE
 	(cd $(@D); \
-		PHP_AUTOCONF=$(HOST_DIR)/bin/autoconf \
-		PHP_AUTOHEADER=$(HOST_DIR)/bin/autoheader \
+		PHP_AUTOCONF=$(AUTOCONF) \
+		PHP_AUTOHEADER=$(AUTOHEADER) \
 		$(STAGING_DIR)/usr/bin/phpize)
 endef
 
package/socat/socat.mk +1 -1
index c6f99c2afa..41748d8227 100644
@@ -41,7 +41,7 @@ SOCAT_CONF_OPTS += --disable-readline
 endif
 
 define SOCAT_RUN_AUTOCONF
-	(cd $(@D); $(HOST_DIR)/bin/autoconf)
+	(cd $(@D); $(AUTOCONF))
 endef
 
 SOCAT_PRE_CONFIGURE_HOOKS += SOCAT_RUN_AUTOCONF
Signature · 1 line
2.20.1
#1 lore raw

PATCH v4 2/2 package/php-xdebug: new package

Extension for PHP to assist with debugging and development.

---

Changes v3 -> v4:
- add myself to the DEVELOPERS file

Changes v2 -> v3:
- sorted correctly the new entry in the top level Config.in
- use the AUTOCONF and AUTOHEADER variables from automake.mk

Changes v1 -> v2:
- move xdebug to php extensions submenu, with the following two consequences:
- makes it dependent on php
- makes it wrapped inside !STATIC test
- removed empty line in Config.in
- removed Web page: prefix in help string
- one option per line in PHP_XDEBUG_CONF_OPTS
- renamed to php-xdebug
- changed license to Xdebug License (PHP-3.0-like)

---

 DEVELOPERS                         |  3 +++
 package/Config.in                  |  1 +
 package/php-xdebug/Config.in       |  6 ++++++
 package/php-xdebug/php-xdebug.hash |  3 +++
 package/php-xdebug/php-xdebug.mk   | 28 ++++++++++++++++++++++++++++
 5 files changed, 41 insertions(+)
 create mode 100644 package/php-xdebug/Config.in
 create mode 100644 package/php-xdebug/php-xdebug.hash
 create mode 100644 package/php-xdebug/php-xdebug.mk
DEVELOPERS +3 -0
index ec4f50a79e..322d7f59c7 100644
@@ -1724,6 +1724,9 @@ F:	package/libevdev/
 N:	Nicola Di Lieto <[email protected]>
 F:	package/uacme/
 
+N:	Nicolas Carrier <[email protected]>
+F:	package/php-xdebug/
+
 N:	Nicolas Cavallari <[email protected]>
 F:	package/libgit2/
 
package/Config.in +1 -0
index d78b4c444b..4f1b80a8e4 100644
@@ -801,6 +801,7 @@ menu "External php extensions"
 	source "package/php-imagick/Config.in"
 	source "package/php-memcached/Config.in"
 	source "package/php-ssh2/Config.in"
+	source "package/php-xdebug/Config.in"
 	source "package/php-yaml/Config.in"
 	source "package/php-zmq/Config.in"
 endmenu
package/php-xdebug/Config.in new file +6 -0
new file mode 100644
index 0000000000..b5919e06cd
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_PHP_XDEBUG
+	bool "php-xdebug"
+	help
+	  Extension for PHP to assist with debugging and development.
+
+	  http://xdebug.org
package/php-xdebug/php-xdebug.hash new file +3 -0
new file mode 100644
index 0000000000..d645142efc
@@ -0,0 +1,3 @@
+# Locally computed
+sha256 ef479ee1a3da3f933e0d046ca8cd0c14601f29b2c0c41cc60c9388546a4e0272  LICENSE
+sha256 b2aeb55335c5649034fe936abb90f61df175c4f0a0f0b97a219b3559541edfbd  php-xdebug-2.7.2.tar.gz
package/php-xdebug/php-xdebug.mk new file +28 -0
new file mode 100644
index 0000000000..a77bbeee90
@@ -0,0 +1,28 @@
+################################################################################
+#
+# php-xdebug
+#
+################################################################################
+
+PHP_XDEBUG_VERSION = 2.7.2
+PHP_XDEBUG_SITE = $(call github,xdebug,xdebug,$(PHP_XDEBUG_VERSION))
+PHP_XDEBUG_INSTALL_STAGING = YES
+PHP_XDEBUG_LICENSE = Xdebug License (PHP-3.0-like)
+PHP_XDEBUG_LICENSE_FILES = LICENSE
+# phpize does the autoconf magic
+PHP_XDEBUG_DEPENDENCIES = php host-autoconf
+PHP_XDEBUG_CONF_OPTS = \
+	--enable-xdebug \
+	--with-php-config=$(STAGING_DIR)/usr/bin/php-config \
+	--with-xdebug=$(STAGING_DIR)/usr
+
+define PHP_XDEBUG_PHPIZE
+	(cd $(@D); \
+		PHP_AUTOCONF=$(AUTOCONF) \
+		PHP_AUTOHEADER=$(AUTOHEADER) \
+		$(STAGING_DIR)/usr/bin/phpize)
+endef
+
+PHP_XDEBUG_PRE_CONFIGURE_HOOKS += PHP_XDEBUG_PHPIZE
+
+$(eval $(autotools-package))
Signature · 1 line
2.20.1
#2 lore raw

PATCH v4 2/2 package/php-xdebug: new package

Hi Nicolas,

Le 25/10/2019 ? 20:22, Nicolas Carrier a ?crit?:

Quoted 3 lines

Extension for PHP to assist with debugging and development.

Best regards,
Romain

Quoted 113 lines

---

Changes v3 -> v4:
- add myself to the DEVELOPERS file

Changes v2 -> v3:
- sorted correctly the new entry in the top level Config.in
- use the AUTOCONF and AUTOHEADER variables from automake.mk

Changes v1 -> v2:
- move xdebug to php extensions submenu, with the following two consequences:
- makes it dependent on php
- makes it wrapped inside !STATIC test
- removed empty line in Config.in
- removed Web page: prefix in help string
- one option per line in PHP_XDEBUG_CONF_OPTS
- renamed to php-xdebug
- changed license to Xdebug License (PHP-3.0-like)

---

 DEVELOPERS                         |  3 +++
 package/Config.in                  |  1 +
 package/php-xdebug/Config.in       |  6 ++++++
 package/php-xdebug/php-xdebug.hash |  3 +++
 package/php-xdebug/php-xdebug.mk   | 28 ++++++++++++++++++++++++++++
 5 files changed, 41 insertions(+)
 create mode 100644 package/php-xdebug/Config.in
 create mode 100644 package/php-xdebug/php-xdebug.hash
 create mode 100644 package/php-xdebug/php-xdebug.mk
DEVELOPERS +3 -0
index ec4f50a79e..322d7f59c7 100644
@@ -1724,6 +1724,9 @@ F:	package/libevdev/
 N:	Nicola Di Lieto <[email protected]>
 F:	package/uacme/
 
+N:	Nicolas Carrier <[email protected]>
+F:	package/php-xdebug/
+
 N:	Nicolas Cavallari <[email protected]>
 F:	package/libgit2/
 
package/Config.in +1 -0
index d78b4c444b..4f1b80a8e4 100644
@@ -801,6 +801,7 @@ menu "External php extensions"
 	source "package/php-imagick/Config.in"
 	source "package/php-memcached/Config.in"
 	source "package/php-ssh2/Config.in"
+	source "package/php-xdebug/Config.in"
 	source "package/php-yaml/Config.in"
 	source "package/php-zmq/Config.in"
 endmenu
package/php-xdebug/Config.in new file +6 -0
new file mode 100644
index 0000000000..b5919e06cd
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_PHP_XDEBUG
+	bool "php-xdebug"
+	help
+	  Extension for PHP to assist with debugging and development.
+
+	  http://xdebug.org
package/php-xdebug/php-xdebug.hash new file +3 -0
new file mode 100644
index 0000000000..d645142efc
@@ -0,0 +1,3 @@
+# Locally computed
+sha256 ef479ee1a3da3f933e0d046ca8cd0c14601f29b2c0c41cc60c9388546a4e0272  LICENSE
+sha256 b2aeb55335c5649034fe936abb90f61df175c4f0a0f0b97a219b3559541edfbd  php-xdebug-2.7.2.tar.gz
package/php-xdebug/php-xdebug.mk new file +28 -0
new file mode 100644
index 0000000000..a77bbeee90
@@ -0,0 +1,28 @@
+################################################################################
+#
+# php-xdebug
+#
+################################################################################
+
+PHP_XDEBUG_VERSION = 2.7.2
+PHP_XDEBUG_SITE = $(call github,xdebug,xdebug,$(PHP_XDEBUG_VERSION))
+PHP_XDEBUG_INSTALL_STAGING = YES
+PHP_XDEBUG_LICENSE = Xdebug License (PHP-3.0-like)
+PHP_XDEBUG_LICENSE_FILES = LICENSE
+# phpize does the autoconf magic
+PHP_XDEBUG_DEPENDENCIES = php host-autoconf
+PHP_XDEBUG_CONF_OPTS = \
+	--enable-xdebug \
+	--with-php-config=$(STAGING_DIR)/usr/bin/php-config \
+	--with-xdebug=$(STAGING_DIR)/usr
+
+define PHP_XDEBUG_PHPIZE
+	(cd $(@D); \
+		PHP_AUTOCONF=$(AUTOCONF) \
+		PHP_AUTOHEADER=$(AUTOHEADER) \
+		$(STAGING_DIR)/usr/bin/phpize)
+endef
+
+PHP_XDEBUG_PRE_CONFIGURE_HOOKS += PHP_XDEBUG_PHPIZE
+
+$(eval $(autotools-package))
#3 lore raw

PATCH v4 2/2 package/php-xdebug: new package

Le 25/10/2019 ? 21:14, Romain Naour a ?crit?:

Quoted 69 lines

Hi Nicolas,

Le 25/10/2019 ? 20:22, Nicolas Carrier a ?crit?:

Quoted 3 lines

Extension for PHP to assist with debugging and development.

Best regards,
Romain

Quoted 57 lines

---

Changes v3 -> v4:
- add myself to the DEVELOPERS file

Changes v2 -> v3:
- sorted correctly the new entry in the top level Config.in
- use the AUTOCONF and AUTOHEADER variables from automake.mk

Changes v1 -> v2:
- move xdebug to php extensions submenu, with the following two consequences:
- makes it dependent on php
- makes it wrapped inside !STATIC test
- removed empty line in Config.in
- removed Web page: prefix in help string
- one option per line in PHP_XDEBUG_CONF_OPTS
- renamed to php-xdebug
- changed license to Xdebug License (PHP-3.0-like)

---

 DEVELOPERS                         |  3 +++
 package/Config.in                  |  1 +
 package/php-xdebug/Config.in       |  6 ++++++
 package/php-xdebug/php-xdebug.hash |  3 +++
 package/php-xdebug/php-xdebug.mk   | 28 ++++++++++++++++++++++++++++
 5 files changed, 41 insertions(+)
 create mode 100644 package/php-xdebug/Config.in
 create mode 100644 package/php-xdebug/php-xdebug.hash
 create mode 100644 package/php-xdebug/php-xdebug.mk
DEVELOPERS +3 -0
index ec4f50a79e..322d7f59c7 100644
@@ -1724,6 +1724,9 @@ F:	package/libevdev/
 N:	Nicola Di Lieto <[email protected]>
 F:	package/uacme/
 
+N:	Nicolas Carrier <[email protected]>
+F:	package/php-xdebug/
+
 N:	Nicolas Cavallari <[email protected]>
 F:	package/libgit2/
 
package/Config.in +1 -0
index d78b4c444b..4f1b80a8e4 100644
@@ -801,6 +801,7 @@ menu "External php extensions"
 	source "package/php-imagick/Config.in"
 	source "package/php-memcached/Config.in"
 	source "package/php-ssh2/Config.in"
+	source "package/php-xdebug/Config.in"
 	source "package/php-yaml/Config.in"
 	source "package/php-zmq/Config.in"
 endmenu
Quoted 8 lines

package/php-xdebug/Config.in line 2

Quoted 8 lines
package/php-xdebug/Config.in new file +2 -0
new file mode 100644
index 0000000000..b5919e06cd
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_PHP_XDEBUG
+	bool "php-xdebug"

Other php modules add a dependency on php package here
depends on BR2_PACKAGE_PHP

even if all php modules are guarded by a if BR2_PACKAGE_PHP [1] For example, we don't add a depends on BR2_PACKAGE_PYTHON to python modules.

So you're right it's not necessary to add the "depends on BR2_PACKAGE_PHP, maybe we should remove them.

[1]
https://git.buildroot.net/buildroot/tree/package/Config.in?id=0b056944f5878304f51af3e9edb6d596f24fc370#n559

Best regards,
Romain

Quoted 49 lines
Quoted 48 lines
package/php-xdebug/Config.in new file +4 -0
+	help
+	  Extension for PHP to assist with debugging and development.
+
+	  http://xdebug.org
package/php-xdebug/php-xdebug.hash new file +3 -0
new file mode 100644
index 0000000000..d645142efc
@@ -0,0 +1,3 @@
+# Locally computed
+sha256 ef479ee1a3da3f933e0d046ca8cd0c14601f29b2c0c41cc60c9388546a4e0272  LICENSE
+sha256 b2aeb55335c5649034fe936abb90f61df175c4f0a0f0b97a219b3559541edfbd  php-xdebug-2.7.2.tar.gz
package/php-xdebug/php-xdebug.mk new file +28 -0
new file mode 100644
index 0000000000..a77bbeee90
@@ -0,0 +1,28 @@
+################################################################################
+#
+# php-xdebug
+#
+################################################################################
+
+PHP_XDEBUG_VERSION = 2.7.2
+PHP_XDEBUG_SITE = $(call github,xdebug,xdebug,$(PHP_XDEBUG_VERSION))
+PHP_XDEBUG_INSTALL_STAGING = YES
+PHP_XDEBUG_LICENSE = Xdebug License (PHP-3.0-like)
+PHP_XDEBUG_LICENSE_FILES = LICENSE
+# phpize does the autoconf magic
+PHP_XDEBUG_DEPENDENCIES = php host-autoconf
+PHP_XDEBUG_CONF_OPTS = \
+	--enable-xdebug \
+	--with-php-config=$(STAGING_DIR)/usr/bin/php-config \
+	--with-xdebug=$(STAGING_DIR)/usr
+
+define PHP_XDEBUG_PHPIZE
+	(cd $(@D); \
+		PHP_AUTOCONF=$(AUTOCONF) \
+		PHP_AUTOHEADER=$(AUTOHEADER) \
+		$(STAGING_DIR)/usr/bin/phpize)
+endef
+
+PHP_XDEBUG_PRE_CONFIGURE_HOOKS += PHP_XDEBUG_PHPIZE
+
+$(eval $(autotools-package))
#4 lore raw

PATCH v4 2/2 package/php-xdebug: new package

In reply to Nicolas Carrier
Quoted 4 lines · On Fri, 25 Oct 2019 18:22:49 +0000 Nicolas Carrier…

Extension for PHP to assist with debugging and development.

---

Thanks, I've finally applied! I updated to a newer version of php-xdebug to make it compatible with the newer version of PHP we have, and fixed a small issue caused by other changes in the autoconf variables in Buildroot.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#5 lore raw

PATCH v4 1/2 package: use variables defined by autoconf.mk

In reply to Nicolas Carrier

Le 25/10/2019 ? 20:22, Nicolas Carrier a ?crit?:

Quoted 5 lines

autoconf.mk defines AUTOCONF and AUTOHEADER variables, use them in packages using autoconf.
This is a refactoring which shouldn't impact the final behavior.

Best regards,
Romain

Quoted 188 lines
---
 package/cups/cups.mk                   | 2 +-
 package/libxmlrpc/libxmlrpc.mk         | 2 +-
 package/ncftp/ncftp.mk                 | 2 +-
 package/php-amqp/php-amqp.mk           | 4 ++--
 package/php-geoip/php-geoip.mk         | 4 ++--
 package/php-gnupg/php-gnupg.mk         | 4 ++--
 package/php-imagick/php-imagick.mk     | 4 ++--
 package/php-memcached/php-memcached.mk | 4 ++--
 package/php-ssh2/php-ssh2.mk           | 4 ++--
 package/php-yaml/php-yaml.mk           | 4 ++--
 package/php-zmq/php-zmq.mk             | 4 ++--
 package/socat/socat.mk                 | 2 +-
 12 files changed, 20 insertions(+), 20 deletions(-)
package/cups/cups.mk +1 -1
index bc2913b428..b30fd78b9f 100644
@@ -13,7 +13,7 @@ CUPS_INSTALL_STAGING = YES
 
 # Using autoconf, not autoheader, so we cannot use AUTORECONF = YES.
 define CUPS_RUN_AUTOCONF
-	cd $(@D); $(HOST_DIR)/bin/autoconf -f
+	cd $(@D); $(AUTOCONF) -f
 endef
 CUPS_PRE_CONFIGURE_HOOKS += CUPS_RUN_AUTOCONF
 
package/libxmlrpc/libxmlrpc.mk +1 -1
index 90791bd671..54db9f1f89 100644
@@ -16,7 +16,7 @@ LIBXMLRPC_MAKE = $(MAKE1)
 
 # Using autoconf, not automake, so we cannot use AUTORECONF = YES.
 define LIBXMLRPC_RUN_AUTOCONF
-	cd $(@D); $(HOST_DIR)/bin/autoconf
+	cd $(@D); $(AUTOCONF)
 endef
 
 LIBXMLRPC_PRE_CONFIGURE_HOOKS += LIBXMLRPC_RUN_AUTOCONF
package/ncftp/ncftp.mk +1 -1
index c8c8942333..676a9c5895 100644
@@ -21,7 +21,7 @@ NCFTP_CONF_OPTS = --disable-ccdv
 # We need to pass -I because of the non-standard m4 directory name, and
 # none of the other autotools are used, so the below is the easiest.
 define NCFTP_RUN_AUTOCONF
-	(cd $(@D); $(HOST_DIR)/bin/autoconf -I$(@D)/autoconf_local/)
+	(cd $(@D); $(AUTOCONF) -I$(@D)/autoconf_local/)
 endef
 NCFTP_PRE_CONFIGURE_HOOKS += NCFTP_RUN_AUTOCONF
 
package/php-amqp/php-amqp.mk +2 -2
index c808ecdbd6..8f3ba1f9f4 100644
@@ -16,8 +16,8 @@ PHP_AMQP_LICENSE_FILES = LICENSE
 
 define PHP_AMQP_PHPIZE
 	(cd $(@D); \
-		PHP_AUTOCONF=$(HOST_DIR)/bin/autoconf \
-		PHP_AUTOHEADER=$(HOST_DIR)/bin/autoheader \
+		PHP_AUTOCONF=$(AUTOCONF) \
+		PHP_AUTOHEADER=$(AUTOHEADER) \
 		$(STAGING_DIR)/usr/bin/phpize)
 endef
 
package/php-geoip/php-geoip.mk +2 -2
index 82ecba5816..8bff564e2d 100644
@@ -16,8 +16,8 @@ PHP_GEOIP_LICENSE_FILES = geoip.c
 
 define PHP_GEOIP_PHPIZE
 	(cd $(@D); \
-		PHP_AUTOCONF=$(HOST_DIR)/bin/autoconf \
-		PHP_AUTOHEADER=$(HOST_DIR)/bin/autoheader \
+		PHP_AUTOCONF=$(AUTOCONF) \
+		PHP_AUTOHEADER=$(AUTOHEADER) \
 		$(STAGING_DIR)/usr/bin/phpize)
 endef
 
package/php-gnupg/php-gnupg.mk +2 -2
index ae0a781154..8137da4978 100644
@@ -16,8 +16,8 @@ PHP_GNUPG_LICENSE_FILES = LICENSE
 
 define PHP_GNUPG_PHPIZE
 	(cd $(@D); \
-		PHP_AUTOCONF=$(HOST_DIR)/bin/autoconf \
-		PHP_AUTOHEADER=$(HOST_DIR)/bin/autoheader \
+		PHP_AUTOCONF=$(AUTOCONF) \
+		PHP_AUTOHEADER=$(AUTOHEADER) \
 		$(STAGING_DIR)/usr/bin/phpize)
 endef
 
package/php-imagick/php-imagick.mk +2 -2
index ca0cbc7492..a5541b0035 100644
@@ -16,8 +16,8 @@ PHP_IMAGICK_LICENSE_FILES = LICENSE
 
 define PHP_IMAGICK_PHPIZE
 	(cd $(@D); \
-		PHP_AUTOCONF=$(HOST_DIR)/bin/autoconf \
-		PHP_AUTOHEADER=$(HOST_DIR)/bin/autoheader \
+		PHP_AUTOCONF=$(AUTOCONF) \
+		PHP_AUTOHEADER=$(AUTOHEADER) \
 		$(STAGING_DIR)/usr/bin/phpize)
 endef
 
package/php-memcached/php-memcached.mk +2 -2
index 4607d099f3..67ccc6747a 100644
@@ -18,8 +18,8 @@ PHP_MEMCACHED_LICENSE_FILES = LICENSE fastlz/LICENSE g_fmt.h
 
 define PHP_MEMCACHED_PHPIZE
 	(cd $(@D); \
-		PHP_AUTOCONF=$(HOST_DIR)/bin/autoconf \
-		PHP_AUTOHEADER=$(HOST_DIR)/bin/autoheader \
+		PHP_AUTOCONF=$(AUTOCONF) \
+		PHP_AUTOHEADER=$(AUTOHEADER) \
 		$(STAGING_DIR)/usr/bin/phpize)
 endef
 
package/php-ssh2/php-ssh2.mk +2 -2
index c9c13010dd..98453acbcf 100644
@@ -16,8 +16,8 @@ PHP_SSH2_LICENSE_FILES = LICENSE
 
 define PHP_SSH2_PHPIZE
 	(cd $(@D); \
-		PHP_AUTOCONF=$(HOST_DIR)/bin/autoconf \
-		PHP_AUTOHEADER=$(HOST_DIR)/bin/autoheader \
+		PHP_AUTOCONF=$(AUTOCONF) \
+		PHP_AUTOHEADER=$(AUTOHEADER) \
 		$(STAGING_DIR)/usr/bin/phpize)
 endef
 
package/php-yaml/php-yaml.mk +2 -2
index e23d897978..40f7385c6a 100644
@@ -16,8 +16,8 @@ PHP_YAML_LICENSE_FILES = LICENSE
 
 define PHP_YAML_PHPIZE
 	(cd $(@D); \
-		PHP_AUTOCONF=$(HOST_DIR)/bin/autoconf \
-		PHP_AUTOHEADER=$(HOST_DIR)/bin/autoheader \
+		PHP_AUTOCONF=$(AUTOCONF) \
+		PHP_AUTOHEADER=$(AUTOHEADER) \
 		$(STAGING_DIR)/usr/bin/phpize)
 endef
 
package/php-zmq/php-zmq.mk +2 -2
index fed71955b6..892c42130f 100644
@@ -15,8 +15,8 @@ PHP_ZMQ_LICENSE_FILES = LICENSE
 
 define PHP_ZMQ_PHPIZE
 	(cd $(@D); \
-		PHP_AUTOCONF=$(HOST_DIR)/bin/autoconf \
-		PHP_AUTOHEADER=$(HOST_DIR)/bin/autoheader \
+		PHP_AUTOCONF=$(AUTOCONF) \
+		PHP_AUTOHEADER=$(AUTOHEADER) \
 		$(STAGING_DIR)/usr/bin/phpize)
 endef
 
package/socat/socat.mk +1 -1
index c6f99c2afa..41748d8227 100644
@@ -41,7 +41,7 @@ SOCAT_CONF_OPTS += --disable-readline
 endif
 
 define SOCAT_RUN_AUTOCONF
-	(cd $(@D); $(HOST_DIR)/bin/autoconf)
+	(cd $(@D); $(AUTOCONF))
 endef
 
 SOCAT_PRE_CONFIGURE_HOOKS += SOCAT_RUN_AUTOCONF
#6 lore raw

PATCH v4 1/2 package: use variables defined by autoconf.mk

In reply to Nicolas Carrier

Nicolas, All,

On 2019-10-25 18:22 +0000, Nicolas Carrier spake thusly:

Quoted 5 lines

autoconf.mk defines AUTOCONF and AUTOHEADER variables, use them in packages using autoconf.
This is a refactoring which shouldn't impact the final behavior.

Applied to master, thanks.

Regards,
Yann E. MORIN.

Quoted 194 lines
---
 package/cups/cups.mk                   | 2 +-
 package/libxmlrpc/libxmlrpc.mk         | 2 +-
 package/ncftp/ncftp.mk                 | 2 +-
 package/php-amqp/php-amqp.mk           | 4 ++--
 package/php-geoip/php-geoip.mk         | 4 ++--
 package/php-gnupg/php-gnupg.mk         | 4 ++--
 package/php-imagick/php-imagick.mk     | 4 ++--
 package/php-memcached/php-memcached.mk | 4 ++--
 package/php-ssh2/php-ssh2.mk           | 4 ++--
 package/php-yaml/php-yaml.mk           | 4 ++--
 package/php-zmq/php-zmq.mk             | 4 ++--
 package/socat/socat.mk                 | 2 +-
 12 files changed, 20 insertions(+), 20 deletions(-)
package/cups/cups.mk +1 -1
index bc2913b428..b30fd78b9f 100644
@@ -13,7 +13,7 @@ CUPS_INSTALL_STAGING = YES
 
 # Using autoconf, not autoheader, so we cannot use AUTORECONF = YES.
 define CUPS_RUN_AUTOCONF
-	cd $(@D); $(HOST_DIR)/bin/autoconf -f
+	cd $(@D); $(AUTOCONF) -f
 endef
 CUPS_PRE_CONFIGURE_HOOKS += CUPS_RUN_AUTOCONF
 
package/libxmlrpc/libxmlrpc.mk +1 -1
index 90791bd671..54db9f1f89 100644
@@ -16,7 +16,7 @@ LIBXMLRPC_MAKE = $(MAKE1)
 
 # Using autoconf, not automake, so we cannot use AUTORECONF = YES.
 define LIBXMLRPC_RUN_AUTOCONF
-	cd $(@D); $(HOST_DIR)/bin/autoconf
+	cd $(@D); $(AUTOCONF)
 endef
 
 LIBXMLRPC_PRE_CONFIGURE_HOOKS += LIBXMLRPC_RUN_AUTOCONF
package/ncftp/ncftp.mk +1 -1
index c8c8942333..676a9c5895 100644
@@ -21,7 +21,7 @@ NCFTP_CONF_OPTS = --disable-ccdv
 # We need to pass -I because of the non-standard m4 directory name, and
 # none of the other autotools are used, so the below is the easiest.
 define NCFTP_RUN_AUTOCONF
-	(cd $(@D); $(HOST_DIR)/bin/autoconf -I$(@D)/autoconf_local/)
+	(cd $(@D); $(AUTOCONF) -I$(@D)/autoconf_local/)
 endef
 NCFTP_PRE_CONFIGURE_HOOKS += NCFTP_RUN_AUTOCONF
 
package/php-amqp/php-amqp.mk +2 -2
index c808ecdbd6..8f3ba1f9f4 100644
@@ -16,8 +16,8 @@ PHP_AMQP_LICENSE_FILES = LICENSE
 
 define PHP_AMQP_PHPIZE
 	(cd $(@D); \
-		PHP_AUTOCONF=$(HOST_DIR)/bin/autoconf \
-		PHP_AUTOHEADER=$(HOST_DIR)/bin/autoheader \
+		PHP_AUTOCONF=$(AUTOCONF) \
+		PHP_AUTOHEADER=$(AUTOHEADER) \
 		$(STAGING_DIR)/usr/bin/phpize)
 endef
 
package/php-geoip/php-geoip.mk +2 -2
index 82ecba5816..8bff564e2d 100644
@@ -16,8 +16,8 @@ PHP_GEOIP_LICENSE_FILES = geoip.c
 
 define PHP_GEOIP_PHPIZE
 	(cd $(@D); \
-		PHP_AUTOCONF=$(HOST_DIR)/bin/autoconf \
-		PHP_AUTOHEADER=$(HOST_DIR)/bin/autoheader \
+		PHP_AUTOCONF=$(AUTOCONF) \
+		PHP_AUTOHEADER=$(AUTOHEADER) \
 		$(STAGING_DIR)/usr/bin/phpize)
 endef
 
package/php-gnupg/php-gnupg.mk +2 -2
index ae0a781154..8137da4978 100644
@@ -16,8 +16,8 @@ PHP_GNUPG_LICENSE_FILES = LICENSE
 
 define PHP_GNUPG_PHPIZE
 	(cd $(@D); \
-		PHP_AUTOCONF=$(HOST_DIR)/bin/autoconf \
-		PHP_AUTOHEADER=$(HOST_DIR)/bin/autoheader \
+		PHP_AUTOCONF=$(AUTOCONF) \
+		PHP_AUTOHEADER=$(AUTOHEADER) \
 		$(STAGING_DIR)/usr/bin/phpize)
 endef
 
package/php-imagick/php-imagick.mk +2 -2
index ca0cbc7492..a5541b0035 100644
@@ -16,8 +16,8 @@ PHP_IMAGICK_LICENSE_FILES = LICENSE
 
 define PHP_IMAGICK_PHPIZE
 	(cd $(@D); \
-		PHP_AUTOCONF=$(HOST_DIR)/bin/autoconf \
-		PHP_AUTOHEADER=$(HOST_DIR)/bin/autoheader \
+		PHP_AUTOCONF=$(AUTOCONF) \
+		PHP_AUTOHEADER=$(AUTOHEADER) \
 		$(STAGING_DIR)/usr/bin/phpize)
 endef
 
package/php-memcached/php-memcached.mk +2 -2
index 4607d099f3..67ccc6747a 100644
@@ -18,8 +18,8 @@ PHP_MEMCACHED_LICENSE_FILES = LICENSE fastlz/LICENSE g_fmt.h
 
 define PHP_MEMCACHED_PHPIZE
 	(cd $(@D); \
-		PHP_AUTOCONF=$(HOST_DIR)/bin/autoconf \
-		PHP_AUTOHEADER=$(HOST_DIR)/bin/autoheader \
+		PHP_AUTOCONF=$(AUTOCONF) \
+		PHP_AUTOHEADER=$(AUTOHEADER) \
 		$(STAGING_DIR)/usr/bin/phpize)
 endef
 
package/php-ssh2/php-ssh2.mk +2 -2
index c9c13010dd..98453acbcf 100644
@@ -16,8 +16,8 @@ PHP_SSH2_LICENSE_FILES = LICENSE
 
 define PHP_SSH2_PHPIZE
 	(cd $(@D); \
-		PHP_AUTOCONF=$(HOST_DIR)/bin/autoconf \
-		PHP_AUTOHEADER=$(HOST_DIR)/bin/autoheader \
+		PHP_AUTOCONF=$(AUTOCONF) \
+		PHP_AUTOHEADER=$(AUTOHEADER) \
 		$(STAGING_DIR)/usr/bin/phpize)
 endef
 
package/php-yaml/php-yaml.mk +2 -2
index e23d897978..40f7385c6a 100644
@@ -16,8 +16,8 @@ PHP_YAML_LICENSE_FILES = LICENSE
 
 define PHP_YAML_PHPIZE
 	(cd $(@D); \
-		PHP_AUTOCONF=$(HOST_DIR)/bin/autoconf \
-		PHP_AUTOHEADER=$(HOST_DIR)/bin/autoheader \
+		PHP_AUTOCONF=$(AUTOCONF) \
+		PHP_AUTOHEADER=$(AUTOHEADER) \
 		$(STAGING_DIR)/usr/bin/phpize)
 endef
 
package/php-zmq/php-zmq.mk +2 -2
index fed71955b6..892c42130f 100644
@@ -15,8 +15,8 @@ PHP_ZMQ_LICENSE_FILES = LICENSE
 
 define PHP_ZMQ_PHPIZE
 	(cd $(@D); \
-		PHP_AUTOCONF=$(HOST_DIR)/bin/autoconf \
-		PHP_AUTOHEADER=$(HOST_DIR)/bin/autoheader \
+		PHP_AUTOCONF=$(AUTOCONF) \
+		PHP_AUTOHEADER=$(AUTOHEADER) \
 		$(STAGING_DIR)/usr/bin/phpize)
 endef
 
package/socat/socat.mk +1 -1
index c6f99c2afa..41748d8227 100644
@@ -41,7 +41,7 @@ SOCAT_CONF_OPTS += --disable-readline
 endif
 
 define SOCAT_RUN_AUTOCONF
-	(cd $(@D); $(HOST_DIR)/bin/autoconf)
+	(cd $(@D); $(AUTOCONF))
 endef
 
 SOCAT_PRE_CONFIGURE_HOOKS += SOCAT_RUN_AUTOCONF
Signature · 6 lines
2.20.1

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'