diff options
author | Thomas De Schampheleire <patrickdepinguin@gmail.com> | 2014-09-27 21:32:44 +0200 |
---|---|---|
committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2014-10-04 18:54:16 +0200 |
commit | aaffd209fae91a733fe0becb72268f87bf4ea369 (patch) | |
tree | 40569895ef8a09c605060e2164d86567a12f9889 /package/php | |
parent | 1d2574ac6f6d30044ee138b6235c50a6a3998d8a (diff) | |
download | buildroot-aaffd209fae91a733fe0becb72268f87bf4ea369.tar.gz buildroot-aaffd209fae91a733fe0becb72268f87bf4ea369.zip |
packages: rename FOO_CONF_OPT into FOO_CONF_OPTS
To be consistent with the recent change of FOO_MAKE_OPT into FOO_MAKE_OPTS,
make the same change for FOO_CONF_OPT.
Sed command used:
find * -type f | xargs sed -i 's#_CONF_OPT\>#&S#g'
Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package/php')
-rw-r--r-- | package/php/php.mk | 64 |
1 files changed, 32 insertions, 32 deletions
diff --git a/package/php/php.mk b/package/php/php.mk index f4d30baa8a..2e97c9a39b 100644 --- a/package/php/php.mk +++ b/package/php/php.mk @@ -13,7 +13,7 @@ PHP_INSTALL_TARGET_OPTS = INSTALL_ROOT=$(TARGET_DIR) install PHP_DEPENDENCIES = host-pkgconf PHP_LICENSE = PHP PHP_LICENSE_FILES = LICENSE -PHP_CONF_OPT = --mandir=/usr/share/man \ +PHP_CONF_OPTS = --mandir=/usr/share/man \ --infodir=/usr/share/info \ --disable-all \ --without-pear \ @@ -46,12 +46,12 @@ ifneq ($(BR2_INET_IPV6),y) endif endif -PHP_CONF_OPT += $(if $(BR2_PACKAGE_PHP_CLI),,--disable-cli) -PHP_CONF_OPT += $(if $(BR2_PACKAGE_PHP_CGI),,--disable-cgi) -PHP_CONF_OPT += $(if $(BR2_PACKAGE_PHP_FPM),--enable-fpm,--disable-fpm) +PHP_CONF_OPTS += $(if $(BR2_PACKAGE_PHP_CLI),,--disable-cli) +PHP_CONF_OPTS += $(if $(BR2_PACKAGE_PHP_CGI),,--disable-cgi) +PHP_CONF_OPTS += $(if $(BR2_PACKAGE_PHP_FPM),--enable-fpm,--disable-fpm) ### Extensions -PHP_CONF_OPT += $(if $(BR2_PACKAGE_PHP_EXT_SOCKETS),--enable-sockets) \ +PHP_CONF_OPTS += $(if $(BR2_PACKAGE_PHP_EXT_SOCKETS),--enable-sockets) \ $(if $(BR2_PACKAGE_PHP_EXT_POSIX),--enable-posix) \ $(if $(BR2_PACKAGE_PHP_EXT_SESSION),--enable-session) \ $(if $(BR2_PACKAGE_PHP_EXT_HASH),--enable-hash) \ @@ -79,48 +79,48 @@ PHP_CONF_OPT += $(if $(BR2_PACKAGE_PHP_EXT_SOCKETS),--enable-sockets) \ $(if $(BR2_PACKAGE_PHP_EXT_PHAR),--enable-phar) ifeq ($(BR2_PACKAGE_PHP_EXT_OPENSSL),y) - PHP_CONF_OPT += --with-openssl=$(STAGING_DIR)/usr + PHP_CONF_OPTS += --with-openssl=$(STAGING_DIR)/usr PHP_DEPENDENCIES += openssl endif ifeq ($(BR2_PACKAGE_PHP_EXT_LIBXML2),y) PHP_CONF_ENV += php_cv_libxml_build_works=yes - PHP_CONF_OPT += --enable-libxml --with-libxml-dir=${STAGING_DIR}/usr + PHP_CONF_OPTS += --enable-libxml --with-libxml-dir=${STAGING_DIR}/usr PHP_DEPENDENCIES += libxml2 endif ifeq ($(BR2_PACKAGE_PHP_EXT_WDDX),y) - PHP_CONF_OPT += --enable-wddx --with-libexpat-dir=$(STAGING_DIR)/usr + PHP_CONF_OPTS += --enable-wddx --with-libexpat-dir=$(STAGING_DIR)/usr PHP_DEPENDENCIES += expat endif ifeq ($(BR2_PACKAGE_PHP_EXT_XMLRPC),y) - PHP_CONF_OPT += --with-xmlrpc \ + PHP_CONF_OPTS += --with-xmlrpc \ $(if $(BR2_PACKAGE_LIBICONV),--with-iconv-dir=$(STAGING_DIR)/usr) PHP_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBICONV),libiconv) endif ifneq ($(BR2_PACKAGE_PHP_EXT_ZLIB)$(BR2_PACKAGE_PHP_EXT_ZIP),) - PHP_CONF_OPT += --with-zlib=$(STAGING_DIR)/usr + PHP_CONF_OPTS += --with-zlib=$(STAGING_DIR)/usr PHP_DEPENDENCIES += zlib endif ifeq ($(BR2_PACKAGE_PHP_EXT_GETTEXT),y) - PHP_CONF_OPT += --with-gettext=$(STAGING_DIR)/usr + PHP_CONF_OPTS += --with-gettext=$(STAGING_DIR)/usr PHP_DEPENDENCIES += $(if $(BR2_NEEDS_GETTEXT),gettext) endif ifeq ($(BR2_PACKAGE_PHP_EXT_ICONV),y) ifeq ($(BR2_PACKAGE_LIBICONV),y) - PHP_CONF_OPT += --with-iconv=$(STAGING_DIR)/usr + PHP_CONF_OPTS += --with-iconv=$(STAGING_DIR)/usr PHP_DEPENDENCIES += libiconv else - PHP_CONF_OPT += --with-iconv + PHP_CONF_OPTS += --with-iconv endif endif ifeq ($(BR2_PACKAGE_PHP_EXT_INTL),y) - PHP_CONF_OPT += --enable-intl --with-icu-dir=$(STAGING_DIR)/usr + PHP_CONF_OPTS += --enable-intl --with-icu-dir=$(STAGING_DIR)/usr PHP_DEPENDENCIES += icu # The intl module is implemented in C++, but PHP fails to use # g++ as the compiler for the final link. As a workaround, @@ -129,30 +129,30 @@ ifeq ($(BR2_PACKAGE_PHP_EXT_INTL),y) endif ifeq ($(BR2_PACKAGE_PHP_EXT_GMP),y) - PHP_CONF_OPT += --with-gmp=$(STAGING_DIR)/usr + PHP_CONF_OPTS += --with-gmp=$(STAGING_DIR)/usr PHP_DEPENDENCIES += gmp endif ifeq ($(BR2_PACKAGE_PHP_EXT_READLINE),y) - PHP_CONF_OPT += --with-readline=$(STAGING_DIR)/usr + PHP_CONF_OPTS += --with-readline=$(STAGING_DIR)/usr PHP_DEPENDENCIES += readline endif ### Native MySQL extensions ifeq ($(BR2_PACKAGE_PHP_EXT_MYSQL),y) - PHP_CONF_OPT += --with-mysql=$(STAGING_DIR)/usr + PHP_CONF_OPTS += --with-mysql=$(STAGING_DIR)/usr PHP_DEPENDENCIES += mysql endif ifeq ($(BR2_PACKAGE_PHP_EXT_MYSQLI),y) - PHP_CONF_OPT += --with-mysqli=$(STAGING_DIR)/usr/bin/mysql_config + PHP_CONF_OPTS += --with-mysqli=$(STAGING_DIR)/usr/bin/mysql_config PHP_DEPENDENCIES += mysql endif ### PDO ifeq ($(BR2_PACKAGE_PHP_EXT_PDO),y) - PHP_CONF_OPT += --enable-pdo + PHP_CONF_OPTS += --enable-pdo ifeq ($(BR2_PACKAGE_PHP_EXT_PDO_SQLITE),y) - PHP_CONF_OPT += --with-pdo-sqlite=$(STAGING_DIR)/usr + PHP_CONF_OPTS += --with-pdo-sqlite=$(STAGING_DIR)/usr PHP_DEPENDENCIES += sqlite PHP_CFLAGS += -DSQLITE_OMIT_LOAD_EXTENSION ifneq ($(BR2_LARGEFILE),y) @@ -160,56 +160,56 @@ ifneq ($(BR2_LARGEFILE),y) endif endif ifeq ($(BR2_PACKAGE_PHP_EXT_PDO_MYSQL),y) - PHP_CONF_OPT += --with-pdo-mysql=$(STAGING_DIR)/usr + PHP_CONF_OPTS += --with-pdo-mysql=$(STAGING_DIR)/usr PHP_DEPENDENCIES += mysql endif ifeq ($(BR2_PACKAGE_PHP_EXT_PDO_POSTGRESQL),y) - PHP_CONF_OPT += --with-pdo-pgsql=$(STAGING_DIR)/usr + PHP_CONF_OPTS += --with-pdo-pgsql=$(STAGING_DIR)/usr PHP_DEPENDENCIES += postgresql endif endif ### Use external PCRE if it's available ifeq ($(BR2_PACKAGE_PCRE),y) - PHP_CONF_OPT += --with-pcre-regex=$(STAGING_DIR)/usr + PHP_CONF_OPTS += --with-pcre-regex=$(STAGING_DIR)/usr PHP_DEPENDENCIES += pcre endif ifeq ($(BR2_PACKAGE_PHP_EXT_CURL),y) - PHP_CONF_OPT += --with-curl=$(STAGING_DIR)/usr + PHP_CONF_OPTS += --with-curl=$(STAGING_DIR)/usr PHP_DEPENDENCIES += libcurl endif ifeq ($(BR2_PACKAGE_PHP_EXT_XSL),y) - PHP_CONF_OPT += --with-xsl=$(STAGING_DIR)/usr + PHP_CONF_OPTS += --with-xsl=$(STAGING_DIR)/usr PHP_DEPENDENCIES += libxslt endif ifeq ($(BR2_PACKAGE_PHP_EXT_BZIP2),y) - PHP_CONF_OPT += --with-bz2=$(STAGING_DIR)/usr + PHP_CONF_OPTS += --with-bz2=$(STAGING_DIR)/usr PHP_DEPENDENCIES += bzip2 endif ### DBA ifeq ($(BR2_PACKAGE_PHP_EXT_DBA),y) - PHP_CONF_OPT += --enable-dba + PHP_CONF_OPTS += --enable-dba ifneq ($(BR2_PACKAGE_PHP_EXT_DBA_CDB),y) - PHP_CONF_OPT += --without-cdb + PHP_CONF_OPTS += --without-cdb endif ifneq ($(BR2_PACKAGE_PHP_EXT_DBA_FLAT),y) - PHP_CONF_OPT += --without-flatfile + PHP_CONF_OPTS += --without-flatfile endif ifneq ($(BR2_PACKAGE_PHP_EXT_DBA_INI),y) - PHP_CONF_OPT += --without-inifile + PHP_CONF_OPTS += --without-inifile endif ifeq ($(BR2_PACKAGE_PHP_EXT_DBA_DB4),y) - PHP_CONF_OPT += --with-db4=$(STAGING_DIR)/usr + PHP_CONF_OPTS += --with-db4=$(STAGING_DIR)/usr PHP_DEPENDENCIES += berkeleydb endif endif ifeq ($(BR2_PACKAGE_PHP_EXT_SNMP),y) - PHP_CONF_OPT += --with-snmp=$(STAGING_DIR)/usr + PHP_CONF_OPTS += --with-snmp=$(STAGING_DIR)/usr PHP_DEPENDENCIES += netsnmp endif |