openwrt-mirror/packages
1
0
Fork 0
mirror of https://github.com/openwrt/packages.git synced 2025-12-21 19:14:30 +04:00
Code Issues Packages Projects Releases Wiki Activity

php8: xml modules affect others

Browse Source 
As with gettext modules described in #28078 and #28075, xml and dom
related module selection affects the dependencies of other packages.

Therefore, we invert the dependency logic:

PHP8_LIBXML and PHP8_DOM are are enabled by default and packages
which depend on libxml2 and --enable-dom=shared are not shown (and
the related configure args are disabled) if the config options are
not enabled.

Signed-off-by: Daniel F. Dickinson <dfdpublic@wildtechgarden.ca>
This commit is contained in:
Daniel F. Dickinson
2025-12-14 02:24:05 -05:00
committed by Michael Heimpold
parent 6d6233b6b7
commit f9591b8518
1 changed files with 37 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
lang/php8/Makefile
View File

@@ -63,7 +63,12 @@ endef
define Package/php8/config define Package/php8/config
config PHP8_LIBXML config PHP8_LIBXML
bool "PHP8 LIBXML support" bool "PHP8 LIBXML support"
depends on PACKAGE_php8-cli || PACKAGE_php8-cgi default y
config PHP8_DOM
bool "PHP8 DOM support"
depends on PHP8_LIBXML
default y
config PHP8_SYSTEMTZDATA config PHP8_SYSTEMTZDATA
bool "Use system timezone data instead of php's built-in database" bool "Use system timezone data instead of php's built-in database"
@@ -249,7 +254,7 @@ else
CONFIGURE_ARGS+= --without-curl CONFIGURE_ARGS+= --without-curl
endif endif
ifneq ($(SDK)$(CONFIG_PACKAGE_php8-mod-dom),) ifeq ($(CONFIG_PHP8_DOM),y)
CONFIGURE_ARGS+= --enable-dom=shared CONFIGURE_ARGS+= --enable-dom=shared
else else
CONFIGURE_ARGS+= --disable-dom CONFIGURE_ARGS+= --disable-dom
@@ -399,8 +404,12 @@ else
CONFIGURE_ARGS+= --disable-shmop CONFIGURE_ARGS+= --disable-shmop
endif endif
ifneq ($(SDK)$(CONFIG_PACKAGE_php8-mod-simplexml),) ifeq ($(CONFIG_PHP8_LIBXML),y)
CONFIGURE_ARGS+= --enable-simplexml=shared ifneq ($(SDK)$(CONFIG_PACKAGE_php8-mod-simplexml),)
CONFIGURE_ARGS+= --enable-simplexml=shared
else
CONFIGURE_ARGS+= --disable-simplexml
endif
else else
CONFIGURE_ARGS+= --disable-simplexml CONFIGURE_ARGS+= --disable-simplexml
endif endif
@@ -414,8 +423,12 @@ else
CONFIGURE_ARGS+= --without-snmp CONFIGURE_ARGS+= --without-snmp
endif endif
ifneq ($(SDK)$(CONFIG_PACKAGE_php8-mod-soap),) ifeq ($(CONFIG_PHP8_LIBXML),y)
CONFIGURE_ARGS+= --enable-soap=shared ifneq ($(SDK)$(CONFIG_PACKAGE_php8-mod-soap),)
CONFIGURE_ARGS+= --enable-soap=shared
else
CONFIGURE_ARGS+= --disable-soap
endif
else else
CONFIGURE_ARGS+= --disable-soap CONFIGURE_ARGS+= --disable-soap
endif endif
@@ -471,14 +484,22 @@ else
CONFIGURE_ARGS+= --disable-xml CONFIGURE_ARGS+= --disable-xml
endif endif
ifneq ($(SDK)$(CONFIG_PACKAGE_php8-mod-xmlreader),) ifeq ($(CONFIG_PHP8_LIBXML),y)
CONFIGURE_ARGS+= --enable-xmlreader=shared,"$(STAGING_DIR)/usr" ifneq ($(SDK)$(CONFIG_PACKAGE_php8-mod-xmlreader),)
CONFIGURE_ARGS+= --enable-xmlreader=shared,"$(STAGING_DIR)/usr"
else
CONFIGURE_ARGS+= --disable-xmlreader
endif
else else
CONFIGURE_ARGS+= --disable-xmlreader CONFIGURE_ARGS+= --disable-xmlreader
endif endif
ifneq ($(SDK)$(CONFIG_PACKAGE_php8-mod-xmlwriter),) ifeq ($(CONFIG_PHP8_LIBXML),y)
CONFIGURE_ARGS+= --enable-xmlwriter=shared,"$(STAGING_DIR)/usr" ifneq ($(SDK)$(CONFIG_PACKAGE_php8-mod-xmlwriter),)
CONFIGURE_ARGS+= --enable-xmlwriter=shared,"$(STAGING_DIR)/usr"
else
CONFIGURE_ARGS+= --disable-xmlwriter
endif
else else
CONFIGURE_ARGS+= --disable-xmlwriter CONFIGURE_ARGS+= --disable-xmlwriter
endif endif
@@ -489,7 +510,7 @@ else
CONFIGURE_ARGS+= --without-zip CONFIGURE_ARGS+= --without-zip
endif endif
ifneq ($(SDK)$(CONFIG_PHP8_LIBXML),) ifeq ($(CONFIG_PHP8_LIBXML),y)
CONFIGURE_ARGS+= --with-libxml CONFIGURE_ARGS+= --with-libxml
else else
CONFIGURE_ARGS+= --without-libxml CONFIGURE_ARGS+= --without-libxml
@@ -647,7 +668,7 @@ $(eval $(call BuildModule,bcmath,Bcmath))
$(eval $(call BuildModule,calendar,Calendar)) $(eval $(call BuildModule,calendar,Calendar))
$(eval $(call BuildModule,ctype,Ctype)) $(eval $(call BuildModule,ctype,Ctype))
$(eval $(call BuildModule,curl,cURL,+PACKAGE_php8-mod-curl:libcurl)) $(eval $(call BuildModule,curl,cURL,+PACKAGE_php8-mod-curl:libcurl))
$(eval $(call BuildModule,dom,DOM,+@PHP8_LIBXML +PACKAGE_php8-mod-dom:libxml2)) $(eval $(call BuildModule,dom,DOM,@PHP8_LIBXML @PHP8_DOM +PACKAGE_php8-mod-dom:libxml2))
$(eval $(call BuildModule,exif,EXIF)) $(eval $(call BuildModule,exif,EXIF))
$(eval $(call BuildModule,fileinfo,Fileinfo)) $(eval $(call BuildModule,fileinfo,Fileinfo))
$(eval $(call BuildModule,filter,Filter)) $(eval $(call BuildModule,filter,Filter))
@@ -672,9 +693,9 @@ $(eval $(call BuildModule,pgsql,PostgreSQL,+PACKAGE_php8-mod-pgsql:libpq))
$(eval $(call BuildModule,phar,Phar Archives)) $(eval $(call BuildModule,phar,Phar Archives))
$(eval $(call BuildModule,session,Session)) $(eval $(call BuildModule,session,Session))
$(eval $(call BuildModule,shmop,Shared Memory)) $(eval $(call BuildModule,shmop,Shared Memory))
$(eval $(call BuildModule,simplexml,SimpleXML,+@PHP8_LIBXML +PACKAGE_php8-mod-simplexml:libxml2)) $(eval $(call BuildModule,simplexml,SimpleXML,@PHP8_LIBXML +PACKAGE_php8-mod-simplexml:libxml2))
$(eval $(call BuildModule,snmp,SNMP,+PACKAGE_php8-mod-snmp:libnetsnmp +PACKAGE_php8-mod-snmp:libopenssl)) $(eval $(call BuildModule,snmp,SNMP,+PACKAGE_php8-mod-snmp:libnetsnmp +PACKAGE_php8-mod-snmp:libopenssl))
$(eval $(call BuildModule,soap,SOAP,+@PHP8_LIBXML +PACKAGE_php8-mod-soap:libxml2 +php8-mod-session)) $(eval $(call BuildModule,soap,SOAP,@PHP8_LIBXML +PACKAGE_php8-mod-soap:libxml2 +php8-mod-session))
$(eval $(call BuildModule,sockets,Sockets)) $(eval $(call BuildModule,sockets,Sockets))
$(eval $(call BuildModule,sodium,Sodium,+PACKAGE_php8-mod-sodium:libsodium,30)) $(eval $(call BuildModule,sodium,Sodium,+PACKAGE_php8-mod-sodium:libsodium,30))
$(eval $(call BuildModule,sqlite3,SQLite3,+PACKAGE_php8-mod-sqlite3:libsqlite3)) $(eval $(call BuildModule,sqlite3,SQLite3,+PACKAGE_php8-mod-sqlite3:libsqlite3))
@@ -683,6 +704,6 @@ $(eval $(call BuildModule,sysvsem,System V shared memory))
$(eval $(call BuildModule,sysvshm,System V semaphore)) $(eval $(call BuildModule,sysvshm,System V semaphore))
$(eval $(call BuildModule,tokenizer,Tokenizer)) $(eval $(call BuildModule,tokenizer,Tokenizer))
$(eval $(call BuildModule,xml,XML,+PHP8_LIBXML:libxml2 +!PHP8_LIBXML:libexpat)) $(eval $(call BuildModule,xml,XML,+PHP8_LIBXML:libxml2 +!PHP8_LIBXML:libexpat))
$(eval $(call BuildModule,xmlreader,XMLReader,+@PHP8_LIBXML +PACKAGE_php8-mod-dom:php8-mod-dom +PACKAGE_php8-mod-xmlreader:libxml2)) $(eval $(call BuildModule,xmlreader,XMLReader,@PHP8_LIBXML @PHP8_DOM +PACKAGE_php8-mod-dom:php8-mod-dom +PACKAGE_php8-mod-xmlreader:libxml2))
$(eval $(call BuildModule,xmlwriter,XMLWriter,+@PHP8_LIBXML +PACKAGE_php8-mod-xmlwriter:libxml2)) $(eval $(call BuildModule,xmlwriter,XMLWriter,@PHP8_LIBXML +PACKAGE_php8-mod-xmlwriter:libxml2))
$(eval $(call BuildModule,zip,ZIP,+PACKAGE_php8-mod-zip:libzip)) $(eval $(call BuildModule,zip,ZIP,+PACKAGE_php8-mod-zip:libzip))