[Astlinux-commits] SF.net SVN: astlinux:[7071] branches/1.0

[<abe...@us...>]

Revision: 7071
          http://sourceforge.net/p/astlinux/code/7071
Author:   abelbeck
Date:     2015-05-20 00:34:46 +0000 (Wed, 20 May 2015)
Log Message:
-----------
php, version bump to 5.5.25, add a 'timezonedb' build option to use a custom zoneinfo database file that is much smaller then the new default 32/64-bit version

Modified Paths:
--------------
    branches/1.0/astlinux-ast11.config
    branches/1.0/astlinux-ast13.config
    branches/1.0/astlinux18.config
    branches/1.0/package/php/Config.ext
    branches/1.0/package/php/php.mk

Modified: branches/1.0/astlinux-ast11.config
===================================================================
--- branches/1.0/astlinux-ast11.config	2015-05-17 21:41:50 UTC (rev 7070)
+++ branches/1.0/astlinux-ast11.config	2015-05-20 00:34:46 UTC (rev 7071)
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6998-dirty Configuration
-# Sun Mar  8 11:46:55 2015
+# Buildroot 2011.08-svn7070-dirty Configuration
+# Tue May 19 19:11:47 2015
 #
 BR2_HAVE_DOT_CONFIG=y
 # BR2_arm is not set
@@ -463,6 +463,7 @@
 #
 # PHP Extensions
 #
+BR2_PACKAGE_PHP_EXT_TIMEZONEDB=y
 # BR2_PACKAGE_PHP_EXT_SOCKETS is not set
 BR2_PACKAGE_PHP_EXT_POSIX=y
 BR2_PACKAGE_PHP_EXT_SESSION=y

Modified: branches/1.0/astlinux-ast13.config
===================================================================
--- branches/1.0/astlinux-ast13.config	2015-05-17 21:41:50 UTC (rev 7070)
+++ branches/1.0/astlinux-ast13.config	2015-05-20 00:34:46 UTC (rev 7071)
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6998-dirty Configuration
-# Sun Mar  8 11:46:55 2015
+# Buildroot 2011.08-svn7070-dirty Configuration
+# Tue May 19 19:11:54 2015
 #
 BR2_HAVE_DOT_CONFIG=y
 # BR2_arm is not set
@@ -463,6 +463,7 @@
 #
 # PHP Extensions
 #
+BR2_PACKAGE_PHP_EXT_TIMEZONEDB=y
 # BR2_PACKAGE_PHP_EXT_SOCKETS is not set
 BR2_PACKAGE_PHP_EXT_POSIX=y
 BR2_PACKAGE_PHP_EXT_SESSION=y

Modified: branches/1.0/astlinux18.config
===================================================================
--- branches/1.0/astlinux18.config	2015-05-17 21:41:50 UTC (rev 7070)
+++ branches/1.0/astlinux18.config	2015-05-20 00:34:46 UTC (rev 7071)
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6998-dirty Configuration
-# Sun Mar  8 11:46:55 2015
+# Buildroot 2011.08-svn7070-dirty Configuration
+# Tue May 19 19:11:42 2015
 #
 BR2_HAVE_DOT_CONFIG=y
 # BR2_arm is not set
@@ -463,6 +463,7 @@
 #
 # PHP Extensions
 #
+BR2_PACKAGE_PHP_EXT_TIMEZONEDB=y
 # BR2_PACKAGE_PHP_EXT_SOCKETS is not set
 BR2_PACKAGE_PHP_EXT_POSIX=y
 BR2_PACKAGE_PHP_EXT_SESSION=y

Modified: branches/1.0/package/php/Config.ext
===================================================================
--- branches/1.0/package/php/Config.ext	2015-05-17 21:41:50 UTC (rev 7070)
+++ branches/1.0/package/php/Config.ext	2015-05-20 00:34:46 UTC (rev 7071)
@@ -1,5 +1,16 @@
 menu "PHP Extensions"
 
+config BR2_PACKAGE_PHP_EXT_TIMEZONEDB
+	bool "timezonedb"
+	default y
+	help
+	  Custom TimeZone Database (AstLinux Feature)
+	  Allows the PHP and system Zoneinfo to track each other
+	  and uses the much smaller 32-bit only tzdata
+
+	  Use: ./scripts/php-timezonedb/makearchive.sh
+	  to generate a new database tracking the target's zoneinfo
+
 config BR2_PACKAGE_PHP_EXT_SOCKETS
 	bool "socket"
 	help

Modified: branches/1.0/package/php/php.mk
===================================================================
--- branches/1.0/package/php/php.mk	2015-05-17 21:41:50 UTC (rev 7070)
+++ branches/1.0/package/php/php.mk	2015-05-20 00:34:46 UTC (rev 7071)
@@ -4,13 +4,33 @@
 #
 #############################################################
 
-PHP_VERSION = 5.5.24
+PHP_VERSION = 5.5.25
 PHP_SITE = http://www.php.net/distributions
 PHP_SOURCE = php-$(PHP_VERSION).tar.xz
 PHP_INSTALL_STAGING = YES
 PHP_INSTALL_STAGING_OPT = INSTALL_ROOT=$(STAGING_DIR) install
 PHP_INSTALL_TARGET_OPT = INSTALL_ROOT=$(TARGET_DIR) install
 PHP_DEPENDENCIES = host-pkg-config
+
+ifeq ($(BR2_PACKAGE_PHP_EXT_TIMEZONEDB),y)
+PHP_TIMEZONEDB_VERSION = 2015.3
+PHP_TIMEZONEDB_SITE = http://files.astlinux.org
+PHP_TIMEZONEDB_SOURCE = timezonedb-$(PHP_TIMEZONEDB_VERSION).tar.gz
+
+define PHP_TIMEZONEDB_DOWNLOAD
+	$(call DOWNLOAD,$(PHP_TIMEZONEDB_SITE),$(PHP_TIMEZONEDB_SOURCE))
+endef
+PHP_POST_DOWNLOAD_HOOKS += PHP_TIMEZONEDB_DOWNLOAD
+
+define PHP_TIMEZONEDB_EXTRACT
+	mkdir -p $(@D)/timezonedb
+	$(INFLATE$(suffix $(PHP_TIMEZONEDB_SOURCE))) $(DL_DIR)/$(PHP_TIMEZONEDB_SOURCE) | \
+	$(TAR) $(TAR_STRIP_COMPONENTS)=1 -C $(@D)/timezonedb $(TAR_OPTIONS) -
+	cp $(@D)/timezonedb/timezonedb.h $(@D)/ext/date/lib/timezonedb.h
+endef
+PHP_POST_EXTRACT_HOOKS += PHP_TIMEZONEDB_EXTRACT
+endif
+
 PHP_CONF_OPT = \
 	--mandir=/usr/share/man \
 	--infodir=/usr/share/info \

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.