SF.net SVN: gar:[23063] csw/mgar/pkg/php5/branches
dmichelsen at users.sourceforge.net
dmichelsen at users.sourceforge.net
Sat Feb 22 11:45:59 CET 2014
Revision: 23063
http://sourceforge.net/p/gar/code/23063
Author: dmichelsen
Date: 2014-02-22 10:45:57 +0000 (Sat, 22 Feb 2014)
Log Message:
-----------
php5/branches/php-5.5.x: Initial commit
Modified Paths:
--------------
csw/mgar/pkg/php5/branches/php-5.5.x/Makefile
csw/mgar/pkg/php5/branches/php-5.5.x/checksums
Added Paths:
-----------
csw/mgar/pkg/php5/branches/php-5.5.x/
csw/mgar/pkg/php5/branches/php-5.5.x/files/0001-Undef-disturbing-definition-of-SS-on-Solaris.patch
csw/mgar/pkg/php5/branches/php-5.5.x/files/0002-Undef-ES-on-Solaris.patch
csw/mgar/pkg/php5/branches/php-5.5.x/files/0004-Do-not-add-Wno-write-strings-unconditionally.patch
csw/mgar/pkg/php5/branches/php-5.5.x/files/0005-Remove-another-Wno.patch
Removed Paths:
-------------
csw/mgar/pkg/php5/branches/php-5.5.x/checkpkg.old
Index: csw/mgar/pkg/php5/branches/php-5.5.x
===================================================================
--- csw/mgar/pkg/php5/trunk 2013-11-06 14:25:24 UTC (rev 22420)
+++ csw/mgar/pkg/php5/branches/php-5.5.x 2014-02-22 10:45:57 UTC (rev 23063)
Property changes on: csw/mgar/pkg/php5/branches/php-5.5.x
___________________________________________________________________
Added: svn:ignore
## -0,0 +1 ##
+work
Modified: csw/mgar/pkg/php5/branches/php-5.5.x/Makefile
===================================================================
--- csw/mgar/pkg/php5/trunk/Makefile 2013-11-06 14:25:24 UTC (rev 22420)
+++ csw/mgar/pkg/php5/branches/php-5.5.x/Makefile 2014-02-22 10:45:57 UTC (rev 23063)
@@ -1,8 +1,6 @@
-NAME = php5
-VERSION = 5.3.25
+NAME = php
+VERSION = 5.5.7
GARTYPE = v2
-SF_PROJECT = $(shell echo $(NAME) | sed -e 's/[0-9]//g')
-DISTNAME = $(SF_PROJECT)-$(VERSION)
DESCRIPTION = A high-level scripting language.
define BLURB
@@ -31,13 +29,15 @@
# at least for a decent echo used during build.
PATH := /opt/csw/gnu:/opt/csw/bin:$(PATH)
-VENDOR_URL = http://www.php.net/
-MASTER_SITES = http://us.php.net/distributions/
+MASTER_SITES += http://de1.php.net/distributions/
+# SF_PROJECT = $(shell echo $(NAME) | sed -e 's/[0-9]//g')
+
EXTRA_INSTALL_ENV = INSTALL_ROOT=$(DESTDIR)
+VENDOR_URL = http://www.php.net/
LICENSE = LICENSE
-DISTFILES += $(DISTNAME).tar.bz2
+DISTFILES += $(DISTNAME).tar.xz
DISTFILES += phpext pear.conf.CSW CSWphp5.postinstall
DISTFILES += CSWphp5.cswreleasenotes
DISTFILES += CSWap2-modphp5.cswreleasenotes
@@ -45,12 +45,19 @@
DISTFILES += CSWap2-modphp5.preremove
DISTFILES += httpd-php5.conf
-PATCHFILES += 0001-Strip-usr-ucblib-references.patch
+# PATCHFILES += 0001-Strip-usr-ucblib-references.patch
PATCHFILES += 0003-Do-not-activate-php5-module-during-package-build.patch
+# TBD: Where specifically do these come from?
+PATCHFILES += 0001-Undef-disturbing-definition-of-SS-on-Solaris.patch
+PATCHFILES += 0002-Undef-ES-on-Solaris.patch
+
+PATCHFILES += 0004-Do-not-add-Wno-write-strings-unconditionally.patch
+PATCHFILES += 0005-Remove-another-Wno.patch
+
BUILD_DEP_PKGS += CSWlibgdbm-dev CSWlibidn-dev CSWlibgd-dev CSWcoreutils
BUILD_DEP_PKGS += CSWlibxml2-dev CSWlibexpat1 CSWlibz-dev CSWlibcurl-dev CSWjpeg
-BUILD_DEP_PKGS += CSWlibpng-dev CSWt1lib CSWlibgdbm-dev CSWlibgmp10
+BUILD_DEP_PKGS += CSWlibpng-dev CSWt1lib-dev CSWlibgdbm-dev CSWlibgmp10
BUILD_DEP_PKGS += CSWggettext-dev CSWlibssl-dev CSWlibgd2 CSWbdb42devel
BUILD_DEP_PKGS += CSWlibcares-dev CSWftype2 CSWlibiconv-dev CSWlibc-client-dev
BUILD_DEP_PKGS += CSWopenldap-dev CSWlibkrb5-dev CSWsasl CSWlibltdl7
@@ -68,13 +75,13 @@
MIGRATE_DEST_DIR = $(sysconfdir)
define php5_subpackage
-PACKAGES += CSWphp5-$(1)
-CATALOGNAME_CSWphp5-$(1) ?= php5_$(1)
-SPKG_DESC_CSWphp5-$(1) ?= The $(1) extention for PHP5
-RUNTIME_DEP_PKGS_CSWphp5-$(1) ?= CSWphp5 $(2)
-OBSOLETED_BY_CSWphp5-$(1) ?= CSWphp5$(1)
-PKGFILES_CSWphp5-$(1) ?= .*lib/php/extensions/.*/$(1).so .*php5/extensions/$(1)
-CHECKPKG_OVERRIDES_CSWphp5-$(1) += surplus-dependency|CSWphp5
+PACKAGES += CSWphp5-$(subst _,-,$(1))
+CATALOGNAME_CSWphp5-$(subst _,-,$(1)) ?= php5_$(subst -,_,$(1))
+SPKG_DESC_CSWphp5-$(subst _,-,$(1)) ?= The $(1) extention for PHP5
+RUNTIME_DEP_PKGS_CSWphp5-$(subst _,-,$(1)) ?= CSWphp5 $(2)
+OBSOLETED_BY_CSWphp5-$(subst _,-,$(1)) ?= CSWphp5$(subst _,-,$(1))
+PKGFILES_CSWphp5-$(subst _,-,$(1)) ?= .*lib/php/extensions/.*/$(1).so .*php5/extensions/$(1)
+CHECKPKG_OVERRIDES_CSWphp5-$(subst _,-,$(1)) += surplus-dependency|CSWphp5
endef
PACKAGES = CSWphp5
@@ -212,10 +219,20 @@
$(eval $(call php5_subpackage,xmlwriter,CSWlibxml2-2))
$(eval $(call php5_subpackage,xsl,CSWlibxml2-2 CSWlibxslt1 CSWlibexslt0))
$(eval $(call php5_subpackage,zip,CSWlibz1))
+$(eval $(call php5_subpackage,ibm_db2,))
+# 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
+
EXTRA_CFLAGS = -I$(prefix)/include/ncursesw
EXTRA_LIB = /opt/csw/postgresql/lib
+# GARCOMPILER = GNU
+
# We link with /usr/ccs/bin/ld which requires setting the path to libCstd.so,
# using CC as linker would have made this automatic.
SUBDIR64-sparc = v9
@@ -225,6 +242,22 @@
NOISALIST = 1
STRIP_LIBTOOL = 1
+EXTRA_CONFIGURE_EXPORTS += IBM_DB_INCLUDE
+EXTRA_CONFIGURE_EXPORTS += IBM_DB_LIB
+EXTRA_CONFIGURE_EXPORTS += DB2INSTANCE
+EXTRA_CONFIGURE_EXPORTS += DB2DIR
+
+# This is needed for DB2 module
+CONFIGURE_ENV_IBM_DB_INCLUDE = /opt/IBM/db2/V8.1/include
+CONFIGURE_ENV_IBM_DB_LIB = /opt/IBM/db2/V8.1/lib
+CONFIGURE_ENV_DB2INSTANCE = db2inst1
+CONFIGURE_ENV_DB2DIR = /opt/IBM/db2/V8.1
+
+EXTRA_RUNPATH_LINKER_FLAGS += -R$(CONFIGURE_ENV_IBM_DB_LIB)
+
+# We need CMSG_SPACE
+EXTRA_CPPFLAGS += -D_XPG4_2 -D__EXTENSIONS__
+
sysconfdir = /etc$(prefix)/php5
CONFIGURE_ARGS += --prefix=$(prefix)/php5
@@ -280,6 +313,7 @@
CONFIGURE_ARGS += --with-gdbm=$(prefix)
CONFIGURE_ARGS += --with-gettext=shared,$(prefix)
CONFIGURE_ARGS += --with-gmp=shared,$(prefix)
+CONFIGURE_ARGS += --with-ibm-db2=shared,/export/db2inst1/sqllib
CONFIGURE_ARGS += --with-iconv=shared,$(prefix)
CONFIGURE_ARGS += --with-imap-ssl=$(prefix)
CONFIGURE_ARGS += --with-imap=shared,$(prefix)
@@ -379,9 +413,9 @@
post-merge:
@echo " ==> Fixing php.ini: adding loadable session.so support"
- @( cd $(PKGROOT)/$(sysconfdir)/; \
+ @-( cd $(PKGROOT)/$(sysconfdir)/; \
perl -pi -e 's/extension=bz2.so/extension=session.so\n;extension=bz2.so/' php.ini.CSW; )
- @( cd $(PKGROOT)/$(sysconfdir)/; \
+ @-( cd $(PKGROOT)/$(sysconfdir)/; \
perl -pi -e 's/extension=bz2.so/extension=ctype.so\n;extension=bz2.so/' php.ini.CSW; )
@echo " ==> Fixing php.ini: adding loadable ctype.so support"
@$(MAKECOOKIE)
Deleted: csw/mgar/pkg/php5/branches/php-5.5.x/checkpkg.old
===================================================================
--- csw/mgar/pkg/php5/trunk/checkpkg.old 2013-11-06 14:25:24 UTC (rev 22420)
+++ csw/mgar/pkg/php5/branches/php-5.5.x/checkpkg.old 2014-02-22 10:45:57 UTC (rev 23063)
@@ -1,23 +0,0 @@
-CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/opt/csw/apache/libexec/libphp5.so
-CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/opt/csw/apache2/libexec/libphp5.so
-CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/opt/csw/php5/bin/php
-CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/opt/csw/php5/bin/php-cgi
-CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/opt/csw/php5/lib/php.ini.CSW
-CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/opt/csw/php5/lib/php/build/phpize.m4
-CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/opt/csw/php5/lib/php/build/libtool.m4
-CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/opt/csw/php5/lib/php/build/shtool
-CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/opt/csw/php5/lib/php/build/acinclude.m4
-CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/opt/csw/php5/lib/php/PEAR/Config.php
-CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/opt/csw/php5/man/man1/php-config.1
-CHECKPKG_OVERRIDES_CSWphp5 += license-missing|/opt/csw/share/doc/php5/license
-CHECKPKG_OVERRIDES_CSWphp5 += bad-rpath-entry|/usr/ucblib|opt/csw/apache/libexec/libphp5.so
-CHECKPKG_OVERRIDES_CSWphp5 += bad-rpath-entry|/usr/ucblib|opt/csw/apache2/libexec/libphp5.so
-CHECKPKG_OVERRIDES_CSWphp5 += bad-rpath-entry|/usr/ucblib|opt/csw/php5/bin/php
-CHECKPKG_OVERRIDES_CSWphp5 += bad-rpath-entry|/usr/ucblib|opt/csw/php5/bin/php-cgi
-
-CHECKPKG_OVERRIDES_CSWphp5 += file-collision|/opt/csw/apache2/libexec/libphp5.so|CSWap2modphp5|CSWphp5
-CHECKPKG_OVERRIDES_CSWphp5 += file-collision|/opt/csw/apache/libexec/libphp5.so|CSWmodphp5|CSWphp5
-CHECKPKG_OVERRIDES_CSWphp5 += file-collision|/opt/csw/apache2/etc/extra/httpd-php5.conf.CSW|CSWap2modphp5|CSWphp5
-CHECKPKG_OVERRIDES_CSWphp5devel += action-class-only-in-pkginfo|none
-CHECKPKG_OVERRIDES_CSWphp5devel += catalogname-does-not-match-pkgname|pkgname=CSWphp5devel|catalogname=php5_devel|expected-catalogname=php5devel
-CHECKPKG_OVERRIDES_CSWphp5devel += license-missing|/opt/csw/share/doc/php5_devel/license
Modified: csw/mgar/pkg/php5/branches/php-5.5.x/checksums
===================================================================
--- csw/mgar/pkg/php5/trunk/checksums 2013-11-06 14:25:24 UTC (rev 22420)
+++ csw/mgar/pkg/php5/branches/php-5.5.x/checksums 2014-02-22 10:45:57 UTC (rev 23063)
@@ -1 +1 @@
-347625ed7fbf2fe1f1c70b0f879fee2a php-5.3.25.tar.bz2
+0c02437f661105221e99a301a5275a41 php-5.5.7.tar.xz
Added: csw/mgar/pkg/php5/branches/php-5.5.x/files/0001-Undef-disturbing-definition-of-SS-on-Solaris.patch
===================================================================
--- csw/mgar/pkg/php5/branches/php-5.5.x/files/0001-Undef-disturbing-definition-of-SS-on-Solaris.patch (rev 0)
+++ csw/mgar/pkg/php5/branches/php-5.5.x/files/0001-Undef-disturbing-definition-of-SS-on-Solaris.patch 2014-02-22 10:45:57 UTC (rev 23063)
@@ -0,0 +1,25 @@
+From c452bab41f87cebf7da533d967973b28046dd92c Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Sat, 14 Dec 2013 22:50:22 +0100
+Subject: [PATCH] Undef disturbing definition of SS on Solaris
+
+---
+ ext/hash/hash_ripemd.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/ext/hash/hash_ripemd.c b/ext/hash/hash_ripemd.c
+index c7c53c6..02786c7 100644
+--- a/ext/hash/hash_ripemd.c
++++ b/ext/hash/hash_ripemd.c
+@@ -172,6 +172,8 @@ static const unsigned char S[80] = {
+ 11, 12, 14, 15, 14, 15, 9, 8, 9, 14, 5, 6, 8, 6, 5, 12,
+ 9, 15, 5, 11, 6, 8, 13, 12, 5, 12, 13, 14, 11, 8, 5, 6 };
+
++/* There is some strange definition on Solaris SS being 18 */
++#undef SS
+ static const unsigned char SS[80] = {
+ 8, 9, 9, 11, 13, 15, 15, 5, 7, 7, 8, 11, 14, 14, 12, 6,
+ 9, 13, 15, 7, 12, 8, 9, 11, 7, 7, 12, 7, 6, 15, 13, 11,
+--
+1.8.4.1
+
Added: csw/mgar/pkg/php5/branches/php-5.5.x/files/0002-Undef-ES-on-Solaris.patch
===================================================================
--- csw/mgar/pkg/php5/branches/php-5.5.x/files/0002-Undef-ES-on-Solaris.patch (rev 0)
+++ csw/mgar/pkg/php5/branches/php-5.5.x/files/0002-Undef-ES-on-Solaris.patch 2014-02-22 10:45:57 UTC (rev 23063)
@@ -0,0 +1,24 @@
+From 7a6340a8064446a4b45683ea09f4a38739b5c5d2 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Sat, 14 Dec 2013 22:59:43 +0100
+Subject: [PATCH] Undef ES on Solaris
+
+---
+ ext/json/JSON_parser.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/ext/json/JSON_parser.c b/ext/json/JSON_parser.c
+index dd832a7..faa71d8 100644
+--- a/ext/json/JSON_parser.c
++++ b/ext/json/JSON_parser.c
+@@ -116,6 +116,7 @@ enum states {
+ VA, /* value */
+ AR, /* array */
+ ST, /* string */
++# undef ES
+ ES, /* escape */
+ U1, /* u1 */
+ U2, /* u2 */
+--
+1.8.4.1
+
Added: csw/mgar/pkg/php5/branches/php-5.5.x/files/0004-Do-not-add-Wno-write-strings-unconditionally.patch
===================================================================
--- csw/mgar/pkg/php5/branches/php-5.5.x/files/0004-Do-not-add-Wno-write-strings-unconditionally.patch (rev 0)
+++ csw/mgar/pkg/php5/branches/php-5.5.x/files/0004-Do-not-add-Wno-write-strings-unconditionally.patch 2014-02-22 10:45:57 UTC (rev 23063)
@@ -0,0 +1,25 @@
+From 6bd0d4115244bbe36f3c5512be6f110a128ca492 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Sun, 15 Dec 2013 20:48:53 +0100
+Subject: [PATCH] Do not add -Wno-write-strings unconditionally
+
+---
+ ext/intl/config.m4 | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/ext/intl/config.m4 b/ext/intl/config.m4
+index 4630a30..02efa69 100644
+--- a/ext/intl/config.m4
++++ b/ext/intl/config.m4
+@@ -85,7 +85,7 @@ if test "$PHP_INTL" != "no"; then
+ breakiterator/codepointiterator_internal.cpp \
+ breakiterator/codepointiterator_methods.cpp \
+ idn/idn.c \
+- $icu_spoof_src, $ext_shared,,$ICU_INCS -Wno-write-strings)
++ $icu_spoof_src, $ext_shared,,$ICU_INCS)
+ PHP_ADD_BUILD_DIR($ext_builddir/collator)
+ PHP_ADD_BUILD_DIR($ext_builddir/converter)
+ PHP_ADD_BUILD_DIR($ext_builddir/common)
+--
+1.8.4.1
+
Added: csw/mgar/pkg/php5/branches/php-5.5.x/files/0005-Remove-another-Wno.patch
===================================================================
--- csw/mgar/pkg/php5/branches/php-5.5.x/files/0005-Remove-another-Wno.patch (rev 0)
+++ csw/mgar/pkg/php5/branches/php-5.5.x/files/0005-Remove-another-Wno.patch 2014-02-22 10:45:57 UTC (rev 23063)
@@ -0,0 +1,25 @@
+From eb07582022356607281c52215eea2ce375413d47 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Sun, 15 Dec 2013 21:36:41 +0100
+Subject: [PATCH] Remove another -Wno...
+
+---
+ configure | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure b/configure
+index ad5d449..4be4068 100755
+--- a/configure
++++ b/configure
+@@ -51018,7 +51018,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ ext_builddir=ext/intl
+ ext_srcdir=$abs_srcdir/ext/intl
+
+- ac_extra=`echo "$ICU_INCS -Wno-write-strings"|$SED s#@ext_srcdir@#$ext_srcdir#g|$SED s#@ext_builddir@#$ext_builddir#g`
++ ac_extra=`echo "$ICU_INCS"|$SED s#@ext_srcdir@#$ext_srcdir#g|$SED s#@ext_builddir@#$ext_builddir#g`
+
+ if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
+ PHP_INTL_SHARED=no
+--
+1.8.4.1
+
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