LGTM Sent from my iPhone
> On Jun 24, 2018, at 2:19 AM, Rafał Miłecki <zaj...@gmail.com> wrote: > > From: Rafał Miłecki <ra...@milecki.pl> > > 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: 84e5012e8853 ("php7: re-enable system timezone data usage") > Signed-off-by: Rafał Miłecki <ra...@milecki.pl> > --- > lang/php7/Makefile | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/lang/php7/Makefile b/lang/php7/Makefile > index aa860a95..93348543 100644 > --- a/lang/php7/Makefile > +++ b/lang/php7/Makefile > @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk > > PKG_NAME:=php > PKG_VERSION:=7.2.6 > -PKG_RELEASE:=1 > +PKG_RELEASE:=2 > > PKG_MAINTAINER:=Michael Heimpold <m...@heimpold.de> > > @@ -74,7 +74,6 @@ define Package/php7/config > config PHP7_SYSTEMTZDATA > bool "Use system timezone data instead of php's built-in database" > depends on PACKAGE_php7-cli || PACKAGE_php7-cgi > - select PACKAGE_zoneinfo-core > default y > help > Enabling this feature automatically selects the zoneinfo-core > package > @@ -86,7 +85,8 @@ define Package/php7 > $(call Package/php7/Default) > > DEPENDS:=+libpcre +zlib \ > - +PHP7_LIBXML:libxml2 > + +PHP7_LIBXML:libxml2 \ > + +PHP7_SYSTEMTZDATA:zoneinfo-core > endef > > define Package/php7/description > -- > 2.13.7 > > > _______________________________________________ > openwrt-devel mailing list > openwrt-devel@lists.openwrt.org > https://lists.openwrt.org/listinfo/openwrt-devel _______________________________________________ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/listinfo/openwrt-devel