SF.net SVN: gar:[23278] csw/mgar/pkg/php5/branches
dmichelsen at users.sourceforge.net
dmichelsen at users.sourceforge.net
Thu Mar 27 08:49:12 CET 2014
Revision: 23278
http://sourceforge.net/p/gar/code/23278
Author: dmichelsen
Date: 2014-03-27 07:49:11 +0000 (Thu, 27 Mar 2014)
Log Message:
-----------
php5/branches: Commit intermediate state
Modified Paths:
--------------
csw/mgar/pkg/php5/branches/php-5.5.x/Makefile
csw/mgar/pkg/php5/branches/php-5.5.x/checksums
csw/mgar/pkg/php5/branches/php-5.6.x/Makefile
csw/mgar/pkg/php5/branches/php-5.6.x/checksums
Added Paths:
-----------
csw/mgar/pkg/php5/branches/php-5.6.x/
Modified: csw/mgar/pkg/php5/branches/php-5.5.x/Makefile
===================================================================
--- csw/mgar/pkg/php5/branches/php-5.5.x/Makefile 2014-03-26 09:08:31 UTC (rev 23277)
+++ csw/mgar/pkg/php5/branches/php-5.5.x/Makefile 2014-03-27 07:49:11 UTC (rev 23278)
@@ -1,5 +1,5 @@
NAME = php
-VERSION = 5.5.7
+VERSION = 5.5.10
GARTYPE = v2
DESCRIPTION = A high-level scripting language.
@@ -37,7 +37,7 @@
VENDOR_URL = http://www.php.net/
LICENSE = LICENSE
-DISTFILES += $(DISTNAME).tar.xz
+DISTFILES += $(DISTNAME).tar.bz2
DISTFILES += phpext pear.conf.CSW CSWphp5.postinstall
DISTFILES += CSWphp5.cswreleasenotes
DISTFILES += CSWap2-modphp5.cswreleasenotes
@@ -223,7 +223,7 @@
# Use reinplacement until this is fixed:
# https://bugs.php.net/bug.php?id=66298
-REINPLACEMENTS += dos
+#REINPLACEMENTS += dos
REINPLACE_MATCH_dos = \r$$
REINPLACE_WITH_dos =
REINPLACE_FILES_dos += ext/opcache/Optimizer/zend_optimizer.c
@@ -237,11 +237,14 @@
# using CC as linker would have made this automatic.
SUBDIR64-sparc = v9
SUBDIR64-i386 = amd64
-EXTRA_LINKER_FLAGS = -L$($(GARCOMPILER)_CC_HOME)/lib/$(SUBDIR$(MEMORYMODEL)-$(GARCH)) -lCstd -lz
+EXTRA_LINKER_FLAGS = -L$($(GARCOMPILER)_CC_HOME)/lib/$(SUBDIR$(MEMORYMODEL)-$(GARCH)) -lCstd -lCrun -lz
NOISALIST = 1
STRIP_LIBTOOL = 1
+# We need to link against libmysql which requires a recent libc
+LINKER_MAPS =
+
EXTRA_CONFIGURE_EXPORTS += IBM_DB_INCLUDE
EXTRA_CONFIGURE_EXPORTS += IBM_DB_LIB
EXTRA_CONFIGURE_EXPORTS += DB2INSTANCE
@@ -256,7 +259,8 @@
EXTRA_RUNPATH_LINKER_FLAGS += -R$(CONFIGURE_ENV_IBM_DB_LIB)
# We need CMSG_SPACE
-EXTRA_CPPFLAGS += -D_XPG4_2 -D__EXTENSIONS__
+# EXTRA_CPPFLAGS += -D_XPG4_2 -D__EXTENSIONS__
+EXTRA_CFLAGS += -D_XPG4_2 -D__EXTENSIONS__
sysconfdir = /etc$(prefix)/php5
Modified: csw/mgar/pkg/php5/branches/php-5.5.x/checksums
===================================================================
--- csw/mgar/pkg/php5/branches/php-5.5.x/checksums 2014-03-26 09:08:31 UTC (rev 23277)
+++ csw/mgar/pkg/php5/branches/php-5.5.x/checksums 2014-03-27 07:49:11 UTC (rev 23278)
@@ -1 +1 @@
-0c02437f661105221e99a301a5275a41 php-5.5.7.tar.xz
+d608230c7890b6a0cc5b92e66e866226 php-5.5.10.tar.bz2
Modified: csw/mgar/pkg/php5/branches/php-5.6.x/Makefile
===================================================================
--- csw/mgar/pkg/php5/branches/php-5.5.x/Makefile 2014-02-22 10:45:57 UTC (rev 23063)
+++ csw/mgar/pkg/php5/branches/php-5.6.x/Makefile 2014-03-27 07:49:11 UTC (rev 23278)
@@ -1,5 +1,5 @@
NAME = php
-VERSION = 5.5.7
+VERSION = 5.6.0alpha3
GARTYPE = v2
DESCRIPTION = A high-level scripting language.
@@ -30,6 +30,7 @@
PATH := /opt/csw/gnu:/opt/csw/bin:$(PATH)
MASTER_SITES += http://de1.php.net/distributions/
+MASTER_SITES += http://downloads.php.net/tyrael/
# SF_PROJECT = $(shell echo $(NAME) | sed -e 's/[0-9]//g')
EXTRA_INSTALL_ENV = INSTALL_ROOT=$(DESTDIR)
@@ -223,10 +224,10 @@
# Use reinplacement until this is fixed:
# https://bugs.php.net/bug.php?id=66298
-REINPLACEMENTS += dos
-REINPLACE_MATCH_dos = \r$$
-REINPLACE_WITH_dos =
-REINPLACE_FILES_dos += ext/opcache/Optimizer/zend_optimizer.c
+#REINPLACEMENTS += dos
+#REINPLACE_MATCH_dos = \r$$
+#REINPLACE_WITH_dos =
+#REINPLACE_FILES_dos += ext/opcache/Optimizer/zend_optimizer.c
EXTRA_CFLAGS = -I$(prefix)/include/ncursesw
EXTRA_LIB = /opt/csw/postgresql/lib
@@ -237,11 +238,15 @@
# using CC as linker would have made this automatic.
SUBDIR64-sparc = v9
SUBDIR64-i386 = amd64
-EXTRA_LINKER_FLAGS = -L$($(GARCOMPILER)_CC_HOME)/lib/$(SUBDIR$(MEMORYMODEL)-$(GARCH)) -lCstd -lz
+#EXTRA_LINKER_FLAGS = -L$($(GARCOMPILER)_CC_HOME)/lib/$(SUBDIR$(MEMORYMODEL)-$(GARCH)) -lCstd -lz
+EXTRA_LINKER_FLAGS = -L$($(GARCOMPILER)_CC_HOME)/lib/$(SUBDIR$(MEMORYMODEL)-$(GARCH)) -lCrun
NOISALIST = 1
STRIP_LIBTOOL = 1
+# We must not cut back on libc as we need current libmysql requiring getpagesizes2
+LINKER_MAPS =
+
EXTRA_CONFIGURE_EXPORTS += IBM_DB_INCLUDE
EXTRA_CONFIGURE_EXPORTS += IBM_DB_LIB
EXTRA_CONFIGURE_EXPORTS += DB2INSTANCE
@@ -256,8 +261,13 @@
EXTRA_RUNPATH_LINKER_FLAGS += -R$(CONFIGURE_ENV_IBM_DB_LIB)
# We need CMSG_SPACE
-EXTRA_CPPFLAGS += -D_XPG4_2 -D__EXTENSIONS__
+# EXTRA_CPPFLAGS += -D_XPG4_2 -D__EXTENSIONS__
+EXTRA_CFLAGS += -D_XPG4_2 -D__EXTENSIONS__
+# Otherwise we get the following error because std:: is not explicitly used:
+# "/opt/SUNWspro/prod/include/CC/Cstd/rw/traits", line 535: Error: The function "wcsstr" must have a prototype.
+#EXTRA_CPPFLAGS += -D_RWSTD_NO_NEW_HEADER
+
sysconfdir = /etc$(prefix)/php5
CONFIGURE_ARGS += --prefix=$(prefix)/php5
@@ -361,7 +371,7 @@
endif
# Disable Tests (report submitted to PHP QA)
-SKIPTEST = 1
+#SKIPTEST = 1
#ENABLE_CHECK = 0
TEST_TARGET = test
@@ -373,7 +383,7 @@
@(cd $(WORKSRC); rm .gitignore; git add -A; git commit -m 'adding files that were previously ignored' )
@$(MAKECOOKIE)
-pre-configure-modulated:
+xxxxpre-configure-modulated:
@echo Munging c-client routine in configure.
@(cd $(WORKSRC); \
perl -pi -e "s|c-client4 c-client|c-client.2007f|g" configure; \
@@ -411,7 +421,7 @@
done )
@$(MAKECOOKIE)
-post-merge:
+post-merge-all:
@echo " ==> Fixing php.ini: adding loadable session.so support"
@-( cd $(PKGROOT)/$(sysconfdir)/; \
perl -pi -e 's/extension=bz2.so/extension=session.so\n;extension=bz2.so/' php.ini.CSW; )
Modified: csw/mgar/pkg/php5/branches/php-5.6.x/checksums
===================================================================
--- csw/mgar/pkg/php5/branches/php-5.5.x/checksums 2014-02-22 10:45:57 UTC (rev 23063)
+++ csw/mgar/pkg/php5/branches/php-5.6.x/checksums 2014-03-27 07:49:11 UTC (rev 23278)
@@ -1 +1 @@
-0c02437f661105221e99a301a5275a41 php-5.5.7.tar.xz
+57d9317dab2e8eab962990ff0c5ea70a php-5.6.0alpha3.tar.xz
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list