cubixle/packages
1
0
Fork 0
mirror of https://github.com/novatiq/packages.git synced 2026-04-30 07:28:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

php7: add package dependency on zoneinfo-core

Browse Source 
Having "select PACKAGE_zoneinfo-core" wasn't enough for builds without
php7-cli=y or php7-cgi=y. It didn't result in installing zoneinfo-core
when using "opkg install" (during runtime or when building images with
CONFIG_TARGET_PER_DEVICE_ROOTFS).

Missing zoneinfo results in PHP fatal errors, e.g.:
Fatal error: DateTime::createFromFormat(): Timezone database is corrupt - this should *never* happen!

For years users were told to manually install zoneinfo-core package.
This problem was hidden for some time (including 17.01 release) due to
disabled support for CONFIG_PHP7_SYSTEMTZDATA. It's now back as support
for --with-system-tzdata was enabled again.

The proper solution is to simply make php7 package depend on
zoneinfo-core when PHP7_SYSTEMTZDATA is used.

Fixes: 84e5012e88 ("php7: re-enable system timezone data usage")
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
This commit is contained in:
Rafał Miłecki
2018-06-24 10:19:38 +02:00
committed by Michael Heimpold
parent b65a759e80
commit 81332c4765
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lang/php7/Makefile
+2 -2
View File
@@ -74,7 +74,6 @@ define Package/php7/config
config PHP7_SYSTEMTZDATA config PHP7_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"
depends on PACKAGE_php7-cli || PACKAGE_php7-cgi depends on PACKAGE_php7-cli || PACKAGE_php7-cgi
select PACKAGE_zoneinfo-core
default y default y
help help
Enabling this feature automatically selects the zoneinfo-core package Enabling this feature automatically selects the zoneinfo-core package
@@ -86,7 +85,8 @@ define Package/php7
$(call Package/php7/Default) $(call Package/php7/Default)
DEPENDS:=+libpcre +zlib \ DEPENDS:=+libpcre +zlib \
+PHP7_LIBXML:libxml2 +PHP7_LIBXML:libxml2 \
+PHP7_SYSTEMTZDATA:zoneinfo-core
endef endef
define Package/php7/description define Package/php7/description