SF.net SVN: gar:[25304] csw/mgar/pkg/php5/branches/php-5.6.x
cgrzemba at users.sourceforge.net
cgrzemba at users.sourceforge.net
Thu Oct 22 13:12:37 CEST 2015
Revision: 25304
http://sourceforge.net/p/gar/code/25304
Author: cgrzemba
Date: 2015-10-22 11:12:37 +0000 (Thu, 22 Oct 2015)
Log Message:
-----------
php5/branches/php-5.6.x: update version, build modphp for Apache24
Modified Paths:
--------------
csw/mgar/pkg/php5/branches/php-5.6.x/Makefile
csw/mgar/pkg/php5/branches/php-5.6.x/checksums
csw/mgar/pkg/php5/branches/php-5.6.x/files/0001-Strip-usr-ucblib-references.patch
csw/mgar/pkg/php5/branches/php-5.6.x/files/CSWap2-modphp5.postinstall
csw/mgar/pkg/php5/branches/php-5.6.x/files/CSWap2-modphp5.preremove
Added Paths:
-----------
csw/mgar/pkg/php5/branches/php-5.6.x/files/0006-disable-zts-build
csw/mgar/pkg/php5/branches/php-5.6.x/files/map.solaris10
Modified: csw/mgar/pkg/php5/branches/php-5.6.x/Makefile
===================================================================
--- csw/mgar/pkg/php5/branches/php-5.6.x/Makefile 2015-10-21 07:06:29 UTC (rev 25303)
+++ csw/mgar/pkg/php5/branches/php-5.6.x/Makefile 2015-10-22 11:12:37 UTC (rev 25304)
@@ -1,5 +1,5 @@
NAME = php
-VERSION = 5.6.0
+VERSION = 5.6.13
GARTYPE = v2
DESCRIPTION = A high-level scripting language.
@@ -17,14 +17,16 @@
endef
EXTRA_MODULATORS = SAPI
-MODULATIONS_SAPI = cgi ap2
+# MODULATIONS_SAPI = cgi ap2
+MODULATIONS_SAPI = ap2
MERGE_SCRIPTS_isa-default-sapi-cgi = copy-all
MERGE_SCRIPTS_isa-default-sapi-ap2 = copy-all
# turn on the build scripts to enable/disable modules
PHP5_EXT = 1
-AP2_MODS = 1
-AP2_MODFILES = *libphp5.so
+# this triggers <garhome>/bin/ap2mod_build_scripts
+# AP2_MODS = 1
+# AP2_MODFILES = *libphp5.so
# at least for a decent echo used during build.
PATH := /opt/csw/gnu:/opt/csw/bin:$(PATH)
@@ -34,7 +36,8 @@
MASTER_SITES += http://snaps.php.net/
# SF_PROJECT = $(shell echo $(NAME) | sed -e 's/[0-9]//g')
-EXTRA_INSTALL_ENV = INSTALL_ROOT=$(DESTDIR)
+EXTRA_INSTALL_ENV = INSTALL_ROOT=$(DESTDIR)
+EXTRA_TEST_ENV = NO_INTERACTION=1
VENDOR_URL = http://www.php.net/
LICENSE = LICENSE
@@ -47,8 +50,9 @@
DISTFILES += CSWap2-modphp5.postinstall
DISTFILES += CSWap2-modphp5.preremove
DISTFILES += httpd-php5.conf
+DISTFILES += map.solaris10
-# 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?
@@ -57,12 +61,14 @@
PATCHFILES += 0004-Do-not-add-Wno-write-strings-unconditionally.patch
PATCHFILES += 0005-Remove-another-Wno.patch
+# our apache24 has threaded and prefork MPM, needs 'autoreconf'
+PATCHFILES += 0006-disable-zts-build
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
-BUILD_DEP_PKGS += CSWggettext-dev CSWlibssl-dev CSWlibgd2 CSWbdb42devel
-BUILD_DEP_PKGS += CSWlibcares-dev CSWftype2 CSWlibiconv-dev CSWlibc-client-dev
+BUILD_DEP_PKGS += CSWggettext-dev CSWlibssl-dev CSWlibgd2
+BUILD_DEP_PKGS += CSWlibcares-dev CSWftype2 CSWlibiconv-dev
BUILD_DEP_PKGS += CSWopenldap-dev CSWlibkrb5-dev CSWsasl CSWlibltdl7
BUILD_DEP_PKGS += CSWmcrypt-dev CSWfreetds CSWmysql-dev CSWunixodbc
BUILD_DEP_PKGS += CSWlibreadline-dev CSWlibncurses-dev CSWnetsnmp-dev
@@ -72,7 +78,7 @@
BUILD_DEP_PKGS += CSWlibaspell-dev
PRESERVECONF = $(sysconfdir)/php.ini $(sysconfdir)/pear.conf
-PRESERVECONF += /opt/csw/apache2/etc/extra/httpd-php5.conf
+PRESERVECONF += $(sysconfdir)/apache2/extra/httpd-php5.conf
MIGRATE_FILES_CSWphp5 = "php.ini"
MIGRATE_SOURCE_DIR_CSWphp5 = /opt/csw/php5/lib
MIGRATE_DEST_DIR = $(sysconfdir)
@@ -82,17 +88,18 @@
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))
+# 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
+# CHECKPKG_OVERRIDES_CSWphp5-$(subst _,-,$(1)) += surplus-dependency|CSWphp5
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 += CSWlibicui18n55
+RUNTIME_DEP_PKGS_CSWphp5 += CSWlibicuuc55
+RUNTIME_DEP_PKGS_CSWphp5 += CSWlibicuio55
INCOMPATIBLE_PKGS_CSWphp5 = CSWphp5mimemagic CSWphp5mhash CSWphp5dbase
INCOMPATIBLE_PKGS_CSWphp5 += CSWphp5ncurses CSWmodphp5
# embeded 'magic' information to detect file types...odd, but...
@@ -101,12 +108,12 @@
CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/opt/csw/php5/bin/php-cgi
# verify these...
CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/etc/opt/csw/php5/php.ini.CSW
+CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/opt/csw/php5/php/man/man1/php-config.1
PACKAGES += CSWphp5-dev
CATALOGNAME_CSWphp5-dev = php5_dev
SPKG_DESC_CSWphp5-dev = Development files for php5
RUNTIME_DEP_PKGS_CSWphp5-dev = CSWphp5
-OBSOLETED_BY_CSWphp5-dev = CSWphp5devel
PKGFILES_CSWphp5-dev = $(prefix)/php5/bin/php-config
PKGFILES_CSWphp5-dev = $(prefix)/bin/php-config
PKGFILES_CSWphp5-dev += $(prefix)/php5/bin/phpize
@@ -134,17 +141,16 @@
CHECKPKG_OVERRIDES_CSWphp5-dev += file-with-bad-content|/usr/local|root/opt/csw/php5/lib/php/build/phpize.m4
CHECKPKG_OVERRIDES_CSWphp5-dev += file-with-bad-content|/usr/local|root/opt/csw/php5/man/man1/php-config.1
-PACKAGES += CSWap2-modphp5
-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
-OBSOLETED_BY_CSWap2-modphp5 = CSWap2modphp5
-PKGFILES_CSWap2-modphp5 += $(prefix)/apache2.*
-CHECKPKG_OVERRIDES_CSWap2-modphp5 += surplus-dependency|CSWphp5
-CHECKPKG_OVERRIDES_CSWap2-modphp5 += file-with-bad-content|/usr/local|root/opt/csw/apache2/libexec/libphp5.so
+PACKAGES += CSWap24-modphp5
+SPKG_DESC_CSWap24-modphp5 = The apache 2.4.x php5 module
+RUNTIME_DEP_PKGS_CSWap24-modphp5 = CSWphp5 CSWapache24 CSWlibxml2-2
+RUNTIME_DEP_PKGS_CSWap24-modphp5 += CSWlibexpat1 CSWlibz1
+RUNTIME_DEP_PKGS_CSWap24-modphp5 += CSWlibicui18n55
+RUNTIME_DEP_PKGS_CSWap24-modphp5 += CSWlibicuuc55
+RUNTIME_DEP_PKGS_CSWap24-modphp5 += CSWlibicuio55
+PKGFILES_CSWap24-modphp5 += $(libdir)/apache2/modules.*
+CHECKPKG_OVERRIDES_CSWap24-modphp5 += surplus-dependency|CSWphp5
+CHECKPKG_OVERRIDES_CSWap24-modphp5 += file-with-bad-content|/usr/local|root/opt/csw/lib/apache2/modules/libphp5.so
$(eval $(call php5_subpackage,bcmath,))
$(eval $(call php5_subpackage,bz2,CSWlibbz2-1-0))
@@ -156,7 +162,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 CSWlibt1-5 CSWlibxpm4))
PKGFILES_CSWphp5-gd += .*/include/php/ext/gd.*
$(eval $(call php5_subpackage,gettext,CSWlibintl8))
$(eval $(call php5_subpackage,gmp,CSWlibgmp10))
@@ -164,7 +170,7 @@
PKGFILES_CSWphp5-hash += .*/include/php/ext/hash.*
$(eval $(call php5_subpackage,iconv,CSWlibiconv2))
PKGFILES_CSWphp5-iconv += .*/include/php/ext/iconv.*
-$(eval $(call php5_subpackage,imap,CSWlibc-client2007f))
+$(eval $(call php5_subpackage,imap,))
$(eval $(call php5_subpackage,json,))
$(eval $(call php5_subpackage,ldap,CSWliblber2-4-2 CSWlibldap2-4-2))
$(eval $(call php5_subpackage,mbstring,))
@@ -207,14 +213,14 @@
$(eval $(call php5_subpackage,session,CSWlibmm))
PKGFILES_CSWphp5-session += .*/include/php/ext/session.*
$(eval $(call php5_subpackage,shmop,))
-$(eval $(call php5_subpackage,snmp,CSWlibnetsnmp25))
+$(eval $(call php5_subpackage,snmp,CSWlibnetsnmp30))
$(eval $(call php5_subpackage,soap,CSWlibxml2-2))
$(eval $(call php5_subpackage,sockets,))
-$(eval $(call php5_subpackage,sqlite,CSWsqlite))
+# $(eval $(call php5_subpackage,sqlite,CSWsqlite))
$(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))
@@ -222,7 +228,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
@@ -234,6 +240,7 @@
EXTRA_CFLAGS = -I$(prefix)/include/ncursesw
EXTRA_LIB = /opt/csw/postgresql/lib
+GARCOMPILER = SOS12U4
# GARCOMPILER = GNU
# We link with /usr/ccs/bin/ld which requires setting the path to libCstd.so,
@@ -241,7 +248,10 @@
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)) -lCrun
+# EXTRA_LINKER_FLAGS = -L$($(GARCOMPILER)_CC_HOME)/lib/$(SUBDIR$(MEMORYMODEL)-$(GARCH)) -lCrun
+# /opt/solarisstudio12.4/lib/compilers/
+EXTRA_LINKER_FLAGS = -L$($(GARCOMPILER)_CC_HOME)/lib/compilers/ -lCrun
+EXTRA_LD_OPTIONS = -M "$(abspath $(WORKDIR)/map.solaris10)"
NOISALIST = 1
STRIP_LIBTOOL = 1
@@ -255,12 +265,12 @@
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
+# 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__
@@ -325,7 +335,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)
@@ -369,11 +379,12 @@
CONFIGURE_ARGS += --enable-cli
ifeq ($(SAPI),ap2)
-CONFIGURE_ARGS += --with-apxs2=$(prefix)/apache2/sbin/apxs
+CONFIGURE_ARGS += --with-apxs2=$(prefix)/bin/apxs
endif
# Disable Tests (report submitted to PHP QA)
-#SKIPTEST = 1
+# works, but takes a lot of time
+SKIPTEST = 1
#ENABLE_CHECK = 0
TEST_TARGET = test
@@ -385,6 +396,10 @@
@-(cd $(WORKSRC); rm .gitignore; git add -A; git commit -m 'adding files that were previously ignored' )
@$(MAKECOOKIE)
+pre-configure-modulated:
+ (cd $(WORKSRC) && autoreconf)
+ @$(MAKECOOKIE)
+
xxxxpre-configure-modulated:
@echo Munging c-client routine in configure.
@(cd $(WORKSRC); \
@@ -395,23 +410,23 @@
# this allows apxs to install the module. stupid, but i couldn't make
# the darn thing _not_ do try to add the httpd.conf lines, even with
# patching...
-pre-install-modulated: AP2SYSCONF=/opt/csw/apache2/etc
-pre-install-modulated: $(PI_SCRIPTS)
- @(mkdir -p $(DESTDIR)$(AP2SYSCONF); \
- cp $(AP2SYSCONF)/httpd.conf $(DESTDIR)$(AP2SYSCONF) )
- @echo "LoadModule foo_module libexec/mod_foo.so" >> $(DESTDIR)$(AP2SYSCONF)/httpd.conf
- @echo "LoadModule foo1_module libexec/mod_foo1.so" >> $(DESTDIR)$(AP2SYSCONF)/httpd.conf
- @echo "LoadModule foo2_module libexec/mod_foo2.so" >> $(DESTDIR)$(AP2SYSCONF)/httpd.conf
- @$(MAKECOOKIE)
+# pre-install-modulated: AP2SYSCONF=$(sysconfdir)/apache2
+# pre-install-modulated: $(PI_SCRIPTS)
+# @(mkdir -p $(DESTDIR)$(AP2SYSCONF); \
+# cp $(AP2SYSCONF)/httpd.conf $(DESTDIR)$(AP2SYSCONF) )
+# @echo "LoadModule foo_module libexec/mod_foo.so" >> $(DESTDIR)$(AP2SYSCONF)/httpd.conf
+# @echo "LoadModule foo1_module libexec/mod_foo1.so" >> $(DESTDIR)$(AP2SYSCONF)/httpd.conf
+# @echo "LoadModule foo2_module libexec/mod_foo2.so" >> $(DESTDIR)$(AP2SYSCONF)/httpd.conf
+# @$(MAKECOOKIE)
-post-install-modulated: AP2SYSCONF=/opt/csw/apache2/etc/httpd.conf
-post-install-modulated: AP2EXTCONF=/opt/csw/apache2/etc/extra
+post-install-modulated: AP2SYSCONF=$(sysconfdir)/apache2/httpd.conf
+post-install-modulated: AP2EXTCONF=$(sysconfdir)/apache2/extra
post-install-modulated: INIDEST=$(DESTDIR)/etc$(prefix)/php5/php.ini
post-install-modulated:
@rm -f $(DESTDIR)$(AP2SYSCONF)
- @mkdir -p $(DESTDIR)$(AP2EXTCONF)
- @cp $(WORKDIR)/httpd-php5.conf $(DESTDIR)$(AP2EXTCONF)
- @cp $(WORKSRC)/php.ini-production $(INIDEST)
+ @ginstall -d -m 0755 $(DESTDIR)$(AP2EXTCONF)
+ @ginstall -m 0644 $(WORKDIR)/httpd-php5.conf $(DESTDIR)$(AP2EXTCONF)
+ @ginstall -m 0644 $(WORKSRC)/php.ini-production $(INIDEST)
@ginstall -m 0755 $(DOWNLOADDIR)/phpext $(DESTDIR)$(prefix)/php5/bin/
@perl -pi -e 's/^;extension=php_(.*).dll/;extension=$$1.so/' $(INIDEST)
@rm -rf $(DESTDIR)/.cha* $(DESTDIR)/.dep* $(DESTDIR)/.reg* $(DESTDIR)/.l* $(DESTDIR)/.f*
Modified: csw/mgar/pkg/php5/branches/php-5.6.x/checksums
===================================================================
--- csw/mgar/pkg/php5/branches/php-5.6.x/checksums 2015-10-21 07:06:29 UTC (rev 25303)
+++ csw/mgar/pkg/php5/branches/php-5.6.x/checksums 2015-10-22 11:12:37 UTC (rev 25304)
@@ -1 +1 @@
-642825d75ce2634d9513d5b21dbee521 php-5.6.0.tar.xz
+de4a8ff544986d9e0da90522fa66f195 php-5.6.13.tar.xz
Modified: csw/mgar/pkg/php5/branches/php-5.6.x/files/0001-Strip-usr-ucblib-references.patch
===================================================================
--- csw/mgar/pkg/php5/branches/php-5.6.x/files/0001-Strip-usr-ucblib-references.patch 2015-10-21 07:06:29 UTC (rev 25303)
+++ csw/mgar/pkg/php5/branches/php-5.6.x/files/0001-Strip-usr-ucblib-references.patch 2015-10-22 11:12:37 UTC (rev 25304)
@@ -9,15 +9,14 @@
---
acinclude.m4 | 2 +-
aclocal.m4 | 2 +-
- configure | 39 +--------------------------------------
configure.in | 2 --
- 4 files changed, 3 insertions(+), 42 deletions(-)
+ 3 files changed, 3 insertions(+), 42 deletions(-)
diff --git a/acinclude.m4 b/acinclude.m4
index 557722f..28d8b1c 100644
--- a/acinclude.m4
+++ b/acinclude.m4
-@@ -2051,7 +2051,7 @@ dnl
+@@ -2062,7 +2062,7 @@ dnl
dnl Search for the sendmail binary
dnl
AC_DEFUN([PHP_PROG_SENDMAIL], [
@@ -27,10 +26,10 @@
PHP_SUBST(PROG_SENDMAIL)
])
diff --git a/aclocal.m4 b/aclocal.m4
-index cde7793..bb24bf9 100644
+index 189149f..ad73fd9 100644
--- a/aclocal.m4
+++ b/aclocal.m4
-@@ -2051,7 +2051,7 @@ dnl
+@@ -2062,7 +2062,7 @@ dnl
dnl Search for the sendmail binary
dnl
AC_DEFUN([PHP_PROG_SENDMAIL], [
@@ -39,68 +38,11 @@
AC_PATH_PROG(PROG_SENDMAIL, sendmail,[], $PATH:$PHP_ALT_PATH)
PHP_SUBST(PROG_SENDMAIL)
])
-diff --git a/configure b/configure
-index 5658cd7..65da668 100755
---- a/configure
-+++ b/configure
-@@ -13963,7 +13963,7 @@ fi
-
-
-
-- PHP_ALT_PATH=/usr/bin:/usr/sbin:/usr/etc:/etc:/usr/ucblib:/usr/lib
-+ PHP_ALT_PATH=/usr/bin:/usr/sbin:/usr/etc:/etc:/usr/lib
- # Extract the first word of "sendmail", so it can be a program name with args.
- set dummy sendmail; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-@@ -14166,43 +14166,6 @@ if test -d /usr/pkg/include -a -d /usr/pkg/lib ; then
- CPPFLAGS="$CPPFLAGS -I/usr/pkg/include"
- LDFLAGS="$LDFLAGS -L/usr/pkg/lib"
- fi
--test -d /usr/ucblib &&
-- if test "/usr/ucblib" != "/usr/$PHP_LIBDIR" && test "/usr/ucblib" != "/usr/lib"; then
--
-- if test -z "/usr/ucblib" || echo "/usr/ucblib" | grep '^/' >/dev/null ; then
-- ai_p=/usr/ucblib
-- else
--
-- ep_dir="`echo /usr/ucblib|$SED 's%/*[^/][^/]*/*$%%'`"
--
-- ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-- ai_p="$ep_realdir/`basename \"/usr/ucblib\"`"
-- fi
--
--
--
--
--
-- unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
--
-- cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
-- if test -n "$unique" && test "`eval $cmd`" = "" ; then
-- eval "LIBPATH$unique=set"
--
-- test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
-- LDFLAGS="$LDFLAGS -L$ai_p"
-- PHP_RPATHS="$PHP_RPATHS $ai_p"
--
-- fi
--
--
--
-- fi
--
--
--
--
--
-
- unset ac_cv_func_socket
- unset ac_cv_func___socket
diff --git a/configure.in b/configure.in
-index 7b6e2a8..7568ed7 100644
+index 5764727..25f54d7 100644
--- a/configure.in
+++ b/configure.in
-@@ -359,8 +359,6 @@ if test -d /usr/pkg/include -a -d /usr/pkg/lib ; then
+@@ -435,8 +435,6 @@ if test -d /usr/pkg/include -a -d /usr/pkg/lib ; then
CPPFLAGS="$CPPFLAGS -I/usr/pkg/include"
LDFLAGS="$LDFLAGS -L/usr/pkg/lib"
fi
@@ -109,6 +51,3 @@
dnl First, library checks.
dnl -------------------------------------------------------------------------
---
-1.7.3.2
-
Added: csw/mgar/pkg/php5/branches/php-5.6.x/files/0006-disable-zts-build
===================================================================
--- csw/mgar/pkg/php5/branches/php-5.6.x/files/0006-disable-zts-build (rev 0)
+++ csw/mgar/pkg/php5/branches/php-5.6.x/files/0006-disable-zts-build 2015-10-22 11:12:37 UTC (rev 25304)
@@ -0,0 +1,11 @@
+--- a/sapi/apache2handler/config.m4
++++ b/sapi/apache2handler/config.m4
+@@ -122,7 +122,7 @@ if test "$PHP_APXS2" != "no"; then
+ PHP_BUILD_THREAD_SAFE
+ fi
+ else
+- APACHE_THREADED_MPM=`$APXS_HTTPD -V | grep 'threaded:.*yes'`
++ APACHE_THREADED_MPM=`$APXS_HTTPD -V | grep 'forked:.*no'`
+ if test -n "$APACHE_THREADED_MPM"; then
+ PHP_BUILD_THREAD_SAFE
+ fi
Modified: csw/mgar/pkg/php5/branches/php-5.6.x/files/CSWap2-modphp5.postinstall
===================================================================
--- csw/mgar/pkg/php5/branches/php-5.6.x/files/CSWap2-modphp5.postinstall 2015-10-21 07:06:29 UTC (rev 25303)
+++ csw/mgar/pkg/php5/branches/php-5.6.x/files/CSWap2-modphp5.postinstall 2015-10-22 11:12:37 UTC (rev 25304)
@@ -1,20 +1,20 @@
#!/bin/sh
-CSW_PREFIX=${PKG_INSTALL_ROOT}/opt/csw
-AP2_CONFIG=$CSW_PREFIX/apache2/etc/httpd.conf
+CSW_PREFIX=${PKG_INSTALL_ROOT}/etc/opt/csw
+AP2_CONFIG=$CSW_PREFIX/apache2/httpd.conf
# Configure mod_php5 in httpd.conf
if [ -n "`egrep 'IfModule (mod_php|php_module)' $AP2_CONFIG`" ]
then
echo "Existing mod_php5 configuration detected"
-elif [ -n "`egrep '#Include etc/extra/httpd-php5.conf' $AP2_CONFIG`" ]; then
+elif [ -n "`egrep '#Include extra/httpd-php5.conf' $AP2_CONFIG`" ]; then
echo "Re-enabling existing config"
- perl -i -plne 's,^#(Include etc/extra/httpd-php5.conf),$1,' $AP2_CONFIG
+ perl -i -plne 's,^#(Include extra/httpd-php5.conf),$1,' $AP2_CONFIG
else
echo "Adding Include for extra/http-php5.conf to httpd.conf"
cat << END >> $AP2_CONFIG
-Include etc/extra/httpd-php5.conf
+Include extra/httpd-php5.conf
END
fi
Modified: csw/mgar/pkg/php5/branches/php-5.6.x/files/CSWap2-modphp5.preremove
===================================================================
--- csw/mgar/pkg/php5/branches/php-5.6.x/files/CSWap2-modphp5.preremove 2015-10-21 07:06:29 UTC (rev 25303)
+++ csw/mgar/pkg/php5/branches/php-5.6.x/files/CSWap2-modphp5.preremove 2015-10-22 11:12:37 UTC (rev 25304)
@@ -1,10 +1,10 @@
#!/bin/sh
-CSW_PREFIX=${PKG_INSTALL_ROOT}/opt/csw
-AP2_CONFIG=$CSW_PREFIX/apache2/etc/httpd.conf
+CSW_PREFIX=${PKG_INSTALL_ROOT}/etc/opt/csw
+AP2_CONFIG=$CSW_PREFIX/apache2/httpd.conf
echo "Disabling httpd-php5.conf in httpd.conf"
-perl -i -plne 's,(?<!#)(Include etc/extra/httpd-php5.conf),#$1,' $AP2_CONFIG
+perl -i -plne 's,(?<!#)(Include extra/httpd-php5.conf),#$1,' $AP2_CONFIG
cat <<END
Added: csw/mgar/pkg/php5/branches/php-5.6.x/files/map.solaris10
===================================================================
--- csw/mgar/pkg/php5/branches/php-5.6.x/files/map.solaris10 (rev 0)
+++ csw/mgar/pkg/php5/branches/php-5.6.x/files/map.solaris10 2015-10-22 11:12:37 UTC (rev 25304)
@@ -0,0 +1,3 @@
+libc.so - SUNW_1.22.5 SUNWprivate_1.1;
+libresolv.so - SUNW_2.2.2 SUNWprivate_2.1 $ADDVERS=SUNW_2.2.2;
+libnsl.so - SUNW_1.9.1 SUNWprivate_1.5 ;
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