SF.net SVN: gar:[23524] csw/mgar/pkg/php5/branches/php-5.5.x
dmichelsen at users.sourceforge.net
dmichelsen at users.sourceforge.net
Tue Apr 29 11:20:37 CEST 2014
Revision: 23524
http://sourceforge.net/p/gar/code/23524
Author: dmichelsen
Date: 2014-04-29 09:20:37 +0000 (Tue, 29 Apr 2014)
Log Message:
-----------
php5/branches/php-5.5.x: Several fixes
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/files/0001-Align-correctly.patch
Modified: csw/mgar/pkg/php5/branches/php-5.5.x/Makefile
===================================================================
--- csw/mgar/pkg/php5/branches/php-5.5.x/Makefile 2014-04-29 08:59:10 UTC (rev 23523)
+++ csw/mgar/pkg/php5/branches/php-5.5.x/Makefile 2014-04-29 09:20:37 UTC (rev 23524)
@@ -1,5 +1,5 @@
NAME = php
-VERSION = 5.5.10
+VERSION = 5.5.11
GARTYPE = v2
DESCRIPTION = A high-level scripting language.
@@ -27,7 +27,7 @@
AP2_MODFILES = *libphp5.so
# at least for a decent echo used during build.
-PATH := /opt/csw/gnu:/opt/csw/bin:$(PATH)
+# PATH := /opt/csw/gnu:/opt/csw/bin:$(PATH)
MASTER_SITES += http://de1.php.net/distributions/
# SF_PROJECT = $(shell echo $(NAME) | sed -e 's/[0-9]//g')
@@ -45,7 +45,9 @@
DISTFILES += CSWap2-modphp5.preremove
DISTFILES += httpd-php5.conf
+# We probably need this, verify
# 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?
@@ -55,6 +57,10 @@
PATCHFILES += 0004-Do-not-add-Wno-write-strings-unconditionally.patch
PATCHFILES += 0005-Remove-another-Wno.patch
+# Use patch for correct alignment. See for details
+# http://lists.opencsw.org/pipermail/maintainers/2014-March/019106.html
+PATCHFILES += 0001-Align-correctly.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-dev CSWlibgdbm-dev CSWlibgmp10
@@ -82,16 +88,23 @@
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
+RUNTIME_DEP_PKGS_sparc_CSWphp5-$(subst _,-,$(1)) += CSWlibz1
+RUNTIME_DEP_PKGS_CSWphp5-$(subst _,-,$(1)) += $(RUNTIME_DEP_PKGS_$(GARCH)_CSWphp5-$(subst _,-,$(1)))
endef
PACKAGES = CSWphp5
CATALOGNAME_CSWphp5 = php5
SPKG_DESC_CSWphp5 = A High-Level Scripting Language
-RUNTIME_DEP_PKGS_CSWphp5 += CSWlibxml2-2 CSWlibexpat1 CSWlibz1
-RUNTIME_DEP_PKGS_CSWphp5 += CSWlibicui18n51
-RUNTIME_DEP_PKGS_CSWphp5 += CSWlibicuuc51
+RUNTIME_DEP_PKGS_CSWphp5 += CSWlibxml2-2
+RUNTIME_DEP_PKGS_CSWphp5 += CSWlibexpat1
+RUNTIME_DEP_PKGS_CSWphp5 += CSWlibz1
+RUNTIME_DEP_PKGS_CSWphp5 += CSWlibicuuc52
+RUNTIME_DEP_PKGS_CSWphp5 += CSWlibicui18n52
+RUNTIME_DEP_PKGS_CSWphp5 += CSWlibicuio52
INCOMPATIBLE_PKGS_CSWphp5 = CSWphp5mimemagic CSWphp5mhash CSWphp5dbase
INCOMPATIBLE_PKGS_CSWphp5 += CSWphp5ncurses CSWmodphp5
+# This is an example
+CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/opt/csw/php5/php/man/man1/php-config.1
# embeded 'magic' information to detect file types...odd, but...
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/lib/php/PEAR/Config.php
@@ -135,9 +148,11 @@
CATALOGNAME_CSWap2-modphp5 = ap2_modphp5
SPKG_DESC_CSWap2-modphp5 = The apache 2.2.x php5 module
RUNTIME_DEP_PKGS_CSWap2-modphp5 = CSWphp5 CSWapache2 CSWlibxml2-2
-RUNTIME_DEP_PKGS_CSWap2-modphp5 += CSWlibexpat1 CSWlibz1
-RUNTIME_DEP_PKGS_CSWap2-modphp5 += CSWlibicui18n51
-RUNTIME_DEP_PKGS_CSWap2-modphp5 += CSWlibicuuc51
+RUNTIME_DEP_PKGS_CSWap2-modphp5 += CSWlibexpat1
+RUNTIME_DEP_PKGS_CSWap2-modphp5 += CSWlibz1
+RUNTIME_DEP_PKGS_CSWap2-modphp5 += CSWlibicuio52
+RUNTIME_DEP_PKGS_CSWap2-modphp5 += CSWlibicui18n52
+RUNTIME_DEP_PKGS_CSWap2-modphp5 += CSWlibicuuc52
OBSOLETED_BY_CSWap2-modphp5 = CSWap2modphp5
PKGFILES_CSWap2-modphp5 += $(prefix)/apache2.*
CHECKPKG_OVERRIDES_CSWap2-modphp5 += surplus-dependency|CSWphp5
@@ -153,7 +168,7 @@
PKGFILES_CSWphp5-dom += .*include/php/ext/dom.*
$(eval $(call php5_subpackage,exif,))
$(eval $(call php5_subpackage,ftp,CSWlibssl1-0-0))
-$(eval $(call php5_subpackage,gd,CSWlibgd2 CSWlibt1-5))
+$(eval $(call php5_subpackage,gd,CSWlibgd3 CSWlibxpm4 CSWlibt1-5))
PKGFILES_CSWphp5-gd += .*/include/php/ext/gd.*
$(eval $(call php5_subpackage,gettext,CSWlibintl8))
$(eval $(call php5_subpackage,gmp,CSWlibgmp10))
@@ -211,7 +226,7 @@
$(eval $(call php5_subpackage,sysvmsg,))
$(eval $(call php5_subpackage,sysvsem,))
$(eval $(call php5_subpackage,sysvshm,))
-$(eval $(call php5_subpackage,tidy,CSWlibtidy0-99))
+$(eval $(call php5_subpackage,tidy,CSWlibtidy0-99-0))
$(eval $(call php5_subpackage,tokenizer,))
$(eval $(call php5_subpackage,wddx,))
$(eval $(call php5_subpackage,xmlreader,CSWlibxml2-2))
@@ -219,7 +234,7 @@
$(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,))
+#$(eval $(call php5_subpackage,ibm_db2,))
# Use reinplacement until this is fixed:
# https://bugs.php.net/bug.php?id=66298
@@ -251,15 +266,15 @@
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
+# Disable DB2 for now as the -R gets into *every* module with the latest linker anomalies
+#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)
+#EXTRA_RUNPATH_LINKER_FLAGS += -R$(CONFIGURE_ENV_IBM_DB_LIB)
# We need CMSG_SPACE
-# EXTRA_CPPFLAGS += -D_XPG4_2 -D__EXTENSIONS__
EXTRA_CFLAGS += -D_XPG4_2 -D__EXTENSIONS__
sysconfdir = /etc$(prefix)/php5
@@ -317,7 +332,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-ibm-db2=shared,/export/db2inst1/sqllib
CONFIGURE_ARGS += --with-iconv=shared,$(prefix)
CONFIGURE_ARGS += --with-imap-ssl=$(prefix)
CONFIGURE_ARGS += --with-imap=shared,$(prefix)
Modified: csw/mgar/pkg/php5/branches/php-5.5.x/checksums
===================================================================
--- csw/mgar/pkg/php5/branches/php-5.5.x/checksums 2014-04-29 08:59:10 UTC (rev 23523)
+++ csw/mgar/pkg/php5/branches/php-5.5.x/checksums 2014-04-29 09:20:37 UTC (rev 23524)
@@ -1 +1 @@
-d608230c7890b6a0cc5b92e66e866226 php-5.5.10.tar.bz2
+c8c9ad960bae0265054b5879423f7a75 php-5.5.11.tar.bz2
Added: csw/mgar/pkg/php5/branches/php-5.5.x/files/0001-Align-correctly.patch
===================================================================
--- csw/mgar/pkg/php5/branches/php-5.5.x/files/0001-Align-correctly.patch (rev 0)
+++ csw/mgar/pkg/php5/branches/php-5.5.x/files/0001-Align-correctly.patch 2014-04-29 09:20:37 UTC (rev 23524)
@@ -0,0 +1,25 @@
+From 4962fb7a6d1029a67f231aa8760ef61b1363a93e Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Tue, 1 Apr 2014 14:10:25 +0200
+Subject: [PATCH] Align correctly
+
+---
+ configure | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure b/configure
+index fee4bdf..08355c3 100755
+--- a/configure
++++ b/configure
+@@ -5443,7 +5443,7 @@ case $host_cpu in
+ ;;
+ sparc*)
+ if test "$SUNCC" = "yes"; then
+- CFLAGS="$CFLAGS -xmemalign=8s"
++ CFLAGS="$CFLAGS -xmemalign=8i"
+ fi
+ ;;
+ esac
+--
+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