瀏覽代碼

php: fix CFLAGS handling

The shell doesn't understand += assignments. Fixes a build issue with
sqlite extension and !largefile (and possibly with ext toolchains as well).

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Peter Korsgaard 14 年之前
父節點
當前提交
b25cf0a05c
共有 1 個文件被更改,包括 7 次插入3 次删除
  1. 7 3
      package/php/php.mk

+ 7 - 3
package/php/php.mk

@@ -19,6 +19,8 @@ PHP_CONF_OPT =  --mandir=/usr/share/man \
 		--with-config-file-path=/etc \
 		--localstatedir=/var \
 
+PHP_CFLAGS = $(TARGET_CFLAGS)
+
 ifneq ($(BR2_PACKAGE_PHP_CLI),y)
 	PHP_CONF_OPT += --disable-cli
 else
@@ -142,7 +144,7 @@ endif
 ifeq ($(BR2_PACKAGE_PHP_EXT_SQLITE),y)
 	PHP_CONF_OPT += --with-sqlite
 ifneq ($(BR2_LARGEFILE),y)
-	PHP_CONF_ENV += CFLAGS+=" -DSQLITE_DISABLE_LFS"
+	PHP_CFLAGS += -DSQLITE_DISABLE_LFS
 endif
 ifeq ($(BR2_PACKAGE_PHP_EXT_SQLITE_UTF8),y)
 	PHP_CONF_OPT += --enable-sqlite-utf8
@@ -159,9 +161,9 @@ ifeq ($(BR2_PACKAGE_PHP_EXT_PDO_SQLITE_EXTERNAL),y)
 else
 	PHP_CONF_OPT += --with-pdo-sqlite
 endif
-	PHP_CONF_ENV += CFLAGS+=" -DSQLITE_OMIT_LOAD_EXTENSION"
+	PHP_CFLAGS += -DSQLITE_OMIT_LOAD_EXTENSION
 ifneq ($(BR2_LARGEFILE),y)
-	PHP_CONF_ENV += CFLAGS+=" -DSQLITE_DISABLE_LFS"
+	PHP_CFLAGS += -DSQLITE_DISABLE_LFS
 endif
 endif
 ifeq ($(BR2_PACKAGE_PHP_EXT_PDO_MYSQL),y)
@@ -192,4 +194,6 @@ define PHP_UNINSTALL_TARGET_CMDS
 	rm -f $(TARGET_DIR)/usr/bin/php*
 endef
 
+PHP_CONF_ENV += CFLAGS="$(PHP_CFLAGS)"
+
 $(eval $(call AUTOTARGETS,package,php))