Revision: 26681
http://sourceforge.net/p/gar/code/26681
Author: dmichelsen
Date: 2020-07-17 14:36:26 +0000 (Fri, 17 Jul 2020)
Log Message:
-----------
php5/branches/php-5.6.x: Update to 5.6.40 and FPM, placement not fully finished
Modified Paths:
--------------
csw/mgar/pkg/php5/branches/php-5.6.x/Makefile
csw/mgar/pkg/php5/branches/php-5.6.x/checksums
Modified: csw/mgar/pkg/php5/branches/php-5.6.x/Makefile
===================================================================
--- csw/mgar/pkg/php5/branches/php-5.6.x/Makefile 2020-07-16 08:29:08 UTC
(rev 26680)
+++ csw/mgar/pkg/php5/branches/php-5.6.x/Makefile 2020-07-17 14:36:26 UTC
(rev 26681)
@@ -1,5 +1,5 @@
NAME = php
-VERSION = 5.6.28
+VERSION = 5.6.40
GARTYPE = v2
BUNDLE = php5
@@ -18,14 +18,31 @@
available.
endef
+BUILD64 = 1
+
EXTRA_MODULATORS = SAPI
MODULATIONS_SAPI += ap24
MODULATIONS_SAPI += ap2
+MODULATIONS_SAPI += fpm
# MODULATIONS_SAPI += cgi
-MERGE_SCRIPTS_isa-default-sapi-cgi = copy-all
MERGE_SCRIPTS_isa-default-sapi-ap2 = copy-all
MERGE_SCRIPTS_isa-default-sapi-ap24 = copy-all
+MERGE_SCRIPTS_isa-default-sapi-fpm = copy-all
+MERGE_SCRIPTS_isa-default64-sapi-ap2 = copy-relocate
+MERGE_SCRIPTS_isa-default64-sapi-ap24 = copy-relocate
+MERGE_SCRIPTS_isa-default64-sapi-fpm = copy-relocate
+# There is no FPM on SPARC before SPARCV9
+SKIP_MODULATIONS += isa-sparcv8plus-sapi-fpm
+
+# There is not 64 bit package for Apache 2.2
+SKIP_MODULATIONS += isa-sparcv9-sapi-ap2
+SKIP_MODULATIONS += isa-amd64-sapi-ap2
+
+# Just for testing!!!
+#SKIP_MODULATIONS += isa-sparcv8plus-sapi-ap24 isa-sparcv8plus-sapi-ap2
+#SKIP_MODULATIONS += isa-sparcv9-sapi-fpm
+
# turn on the build scripts to enable/disable modules
# use the SVR4 class 'build'
PHP5_EXT = 1
@@ -36,12 +53,10 @@
AP2_MODFILES += $(AP2_MODFILES-$(SAPI))
# at least for a decent echo used during build.
-PATH := /opt/csw/gnu:/opt/csw/bin:$(PATH)
+# $(bindir) can contain the 64 bit path
+PATH := /opt/csw/gnu:$(bindir):/opt/csw/bin:$(PATH)
-MASTER_SITES += http://de1.php.net/distributions/
-MASTER_SITES += http://downloads.php.net/tyrael/
-MASTER_SITES += http://snaps.php.net/
-# SF_PROJECT = $(shell echo $(NAME) | sed -e 's/[0-9]//g')
+MASTER_SITES += http://de2.php.net/get/
EXTRA_INSTALL_ENV = INSTALL_ROOT=$(DESTDIR)
EXTRA_TEST_ENV = NO_INTERACTION=1
@@ -90,7 +105,7 @@
BUILD_DEP_PKGS += CSWlibxpm-dev
BUILD_DEP_PKGS += CSWlibaspell-dev
-PRESERVECONF += $(sysconfdir)/php.ini
+PRESERVECONF += $(sysconfdir)/$(MM_LIBDIR)/php.ini
PRESERVECONF += $(sysconfdir)/pear.conf
PRESERVECONF += $(sysconfdir_ap2)/extra/httpd-php5.conf
PRESERVECONF += $(sysconfdir_ap24)/extra/httpd-php5.conf
@@ -101,7 +116,8 @@
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)
+PKGFILES_CSWphp5-$(subst _,-,$(1)) += .*/$(1).so
+PKGFILES_CSWphp5-$(subst _,-,$(1)) += $(includedir)/php/ext/$(1)
# CHECKPKG_OVERRIDES_CSWphp5-$(subst _,-,$(1)) += surplus-dependency|CSWphp5
endef
@@ -169,8 +185,14 @@
RUNTIME_DEP_PKGS_CSWap24-modphp5 += CSWlibicui18n57
RUNTIME_DEP_PKGS_CSWap24-modphp5 += CSWlibicuuc57
RUNTIME_DEP_PKGS_CSWap24-modphp5 += CSWlibicuio57
-PKGFILES_CSWap24-modphp5 += $(libdir)/apache2/modules.*
+#PKGFILES_CSWap24-modphp5 += $(call
baseisadirs,$(prefix)/lib,apache2/modules/libphp5.so)
+PKGFILES_CSWap24-modphp5 += $(prefix)/lib/apache2/modules/libphp5.so
+PKGFILES_CSWap24-modphp5 += $(prefix)/lib/64/apache2/modules/libphp5.so
PKGFILES_CSWap24-modphp5 += $(sysconfdir_ap24).*
+#work/solaris10-i386/pkgroot/opt/csw/lib/apache2/modules/libphp5.so
+#work/solaris10-i386/pkgroot/opt/csw/lib/64/apache2/modules/libphp5.so
+
+
CHECKPKG_OVERRIDES_CSWap24-modphp5 += surplus-dependency|CSWapache24
CHECKPKG_OVERRIDES_CSWap24-modphp5 +=
file-with-bad-content|/usr/local|root/opt/csw/lib/apache2/modules/libphp5.so
@@ -236,19 +258,23 @@
$(eval $(call php5_subpackage,pdo,))
PKGFILES_CSWphp5-pdo += .*/include/php/ext/pdo.*
$(eval $(call php5_subpackage,pdomysql,CSWlibmysqlclient18 CSWphp5-pdo))
-PKGFILES_CSWphp5-pdomysql += .*/lib/php/extensions/.*/pdo_mysql.so
+PKGFILES_CSWphp5-pdomysql += .*/lib/extensions/.*/pdo_mysql.so
+PKGFILES_CSWphp5-pdomysql += .*/lib/64/extensions/.*/pdo_mysql.so
PKGFILES_CSWphp5-pdomysql += .*extensions/pdo_mysql
CHECKPKG_OVERRIDES_CSWphp5-pdomysql += surplus-dependency|CSWphp5-pdo
$(eval $(call php5_subpackage,pdoodbc,CSWlibodbc2 CSWphp5-pdo))
-PKGFILES_CSWphp5-pdoodbc += .*/lib/php/extensions/.*/pdo_odbc.so
+PKGFILES_CSWphp5-pdoodbc += .*/lib/extensions/.*/pdo_odbc.so
+PKGFILES_CSWphp5-pdoodbc += .*/lib/64/extensions/.*/pdo_odbc.so
PKGFILES_CSWphp5-pdoodbc += .*extensions/pdo_odbc
CHECKPKG_OVERRIDES_CSWphp5-pdoodbc += surplus-dependency|CSWphp5-pdo
$(eval $(call php5_subpackage,pdopgsql,CSWlibpq5 CSWphp5-pdo))
-PKGFILES_CSWphp5-pdopgsql += .*/lib/php/extensions/.*/pdo_pgsql.so
+PKGFILES_CSWphp5-pdopgsql += .*/lib/extensions/.*/pdo_pgsql.so
+PKGFILES_CSWphp5-pdopgsql += .*/lib/64/extensions/.*/pdo_pgsql.so
PKGFILES_CSWphp5-pdopgsql += .*extensions/pdo_pgsql
CHECKPKG_OVERRIDES_CSWphp5-pdopgsql += surplus-dependency|CSWphp5-pdo
$(eval $(call php5_subpackage,pdosqlite,CSWphp5-pdo CSWlibsqlite3-0))
-PKGFILES_CSWphp5-pdosqlite += .*/lib/php/extensions/.*/pdo_sqlite.so
+PKGFILES_CSWphp5-pdosqlite += .*/lib/extensions/.*/pdo_sqlite.so
+PKGFILES_CSWphp5-pdosqlite += .*/lib/64/extensions/.*/pdo_sqlite.so
PKGFILES_CSWphp5-pdosqlite += .*extensions/pdo_sqlite
CHECKPKG_OVERRIDES_CSWphp5-pdosqlite += surplus-dependency|CSWphp5-pdo
$(eval $(call php5_subpackage,pgsql,CSWlibpq5))
@@ -256,7 +282,7 @@
$(eval $(call php5_subpackage,pspell,CSWlibaspell15))
RUNTIME_DEP_PKGS_CSWphp5-readline_sparc += CSWlibncurses6
RUNTIME_DEP_PKGS_CSWphp5-readline +=
$(RUNTIME_DEP_PKGS_CSWphp5-readline_$(GARCH))
-$(eval $(call php5_subpackage,readline,CSWlibreadline6))
+$(eval $(call php5_subpackage,readline,CSWlibreadline7))
$(eval $(call php5_subpackage,session,CSWlibmm))
PKGFILES_CSWphp5-session += .*/include/php/ext/session.*
$(eval $(call php5_subpackage,shmop,))
@@ -279,27 +305,26 @@
$(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
+REINPLACE_USRLOCAL += ext/fileinfo/tests/magic
EXTRA_CFLAGS = -I$(prefix)/include/ncursesw
-EXTRA_LIB = /opt/csw/postgresql/lib
+EXTRA_LIB += /opt/csw/postgresql/lib
+# BDB 64 bit libs are in a subdirectory
+EXTRA_LIB += /opt/csw/bdb4/lib
+
GARCOMPILER = SOS12U4
# 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
+SUBDIR64-sparc = sparcv9
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
-# /opt/solarisstudio12.4/lib/compilers/
-EXTRA_LINKER_FLAGS = -L$($(GARCOMPILER)_CC_HOME)/lib/compilers/ -lCrun
+# /opt/solarisstudio12.4/lib/compilers/libCrun.so
+# /opt/solarisstudio12.4/lib/compilers/sparcv9/libCrun.so
+EXTRA_LINKER_FLAGS =
-L$($(GARCOMPILER)_CC_HOME)/lib/compilers/$(SUBDIR$(MEMORYMODEL)-$(GARCH))
-lCrun
EXTRA_LD_OPTIONS = -M "$(abspath $(WORKDIR)/map.solaris10)"
NOISALIST = 1
@@ -329,12 +354,31 @@
# "/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
-sysconfdir_ap24 = /etc$(prefix)/apache2
-sysconfdir_ap2 = $(prefix)/apache2/etc
+sysconfdir = /etc/opt/csw/php5
+sysconfdir_ap2 = /opt/csw/apache2/etc
+sysconfdir_ap24 = /etc/opt/csw/apache2
+sysconfdir_fpm = /etc/opt/csw/apache2
-CONFIGURE_ARGS += --prefix=$(prefix)/php5
-CONFIGURE_ARGS += --sysconfdir=$(sysconfdir)
+# XXX: TBD review options:
+# configure: WARNING: unrecognized options: --enable-magic-quotes,
--enable-sqlite-utf8, --enable-sqlite3, --with-curlwrappers, --with-exec-dir,
--with-sqlite
+
+# Taken out for testing
+exec_prefix = /opt/csw/php5
+
+EXTRA_MERGE_DIRS += $(abspath $(prefix)/bin/$(MM_LIBDIR))
+EXTRA_MERGE_DIRS += $(abspath $(prefix)/sbin/$(MM_LIBDIR))
+EXTRA_MERGE_DIRS += $(abspath $(prefix)/libexec/$(MM_LIBDIR))
+EXTRA_MERGE_DIRS += $(abspath $(prefix)/lib/$(MM_LIBDIR))
+
+#MERGEBASE_$(bindir) ?= $(bindir_install)
+#MERGEBASE_$(sbindir) ?= $(sbindir_install)
+#MERGEBASE_$(libexecdir) ?= $(libexecdir_install)
+#MERGEBASE_$(libdir) ?= $(libdir_install)
+
+CONFIGURE_ARGS += $(DIRPATHS)
+#CONFIGURE_ARGS += --prefix=$(prefix)/php5
+#CONFIGURE_ARGS += --libdir=$(abspath $(prefix)/php5/lib/$(MM_LIBDIR))
+#CONFIGURE_ARGS += --sysconfdir=$(sysconfdir)
## build this static, php can not run without it.
## it is more efficient to have this built into the php binary
CONFIGURE_ARGS += --enable-simplexml
@@ -428,17 +472,20 @@
CONFIGURE_ARGS += --with-zlib-dir=$(prefix)
CONFIGURE_ARGS += --with-zlib=$(prefix)
CONFIGURE_ARGS += --enable-cli
-CONFIGURE_ARGS_fpm += --enable-fpm
+# We don't have Tokyo Cabinet
+CONFIGURE_ARGS += --without-tcadb
-CONFIGURE_ARGS-ap24 += --with-apxs2=$(prefix)/bin/apxs
-CONFIGURE_ARGS-ap2 += --with-apxs2=$(prefix)/apache2/sbin/apxs
+CONFIGURE_ARGS-fpm += --enable-fpm
+CONFIGURE_ARGS-ap24 += --with-apxs2=$(abspath $(prefix)/bin/$(MM_BINDIR))/apxs
+CONFIGURE_ARGS-ap2 += --with-apxs2=$(prefix)/apache2/sbin/$(MM_LIBDIR)/apxs
CONFIGURE_ARGS += $(CONFIGURE_ARGS-$(SAPI))
+TEST_TARGET = test
+
# Disable Tests (report submitted to PHP QA)
# works, but takes a lot of time
-SKIPTEST = 1
+SKIPTEST ?= 1
#ENABLE_CHECK = 0
-TEST_TARGET = test
include gar/category.mk
@@ -471,31 +518,34 @@
# @echo "LoadModule foo2_module libexec/mod_foo2.so" >>
$(DESTDIR)$(AP2SYSCONF)/httpd.conf
# @$(MAKECOOKIE)
-post-install-modulated: AP2SYSCONF=$(sysconfdir_$(SAPI))/httpd.conf
-post-install-modulated: AP2EXTCONF=$(sysconfdir_$(SAPI))/extra
-post-install-modulated: INIDEST=$(DESTDIR)/etc$(prefix)/php5/php.ini
-post-install-modulated:
- @rm -f $(DESTDIR)$(AP2SYSCONF)
- @ginstall -d -m 0755 $(DESTDIR)$(AP2EXTCONF)
- @ginstall -m 0644 $(WORKDIR)/httpd-php5.conf $(DESTDIR)$(AP2EXTCONF)
- @ginstall -m 0644 $(WORKSRC)/php.ini-production $(INIDEST)
- @perl -pi -e 's/^;extension=php_(.*).dll/;extension=$$1.so/' $(INIDEST)
- @ginstall -m 0755 $(DOWNLOADDIR)/phpext $(DESTDIR)$(prefix)/php5/bin/
- @rm -rf $(DESTDIR)/.cha* $(DESTDIR)/.dep* $(DESTDIR)/.reg*
$(DESTDIR)/.l* $(DESTDIR)/.f*
- @perl -pi -e 's!s:17:"http://proxy:3128!s:0:";!'
$(DESTDIR)$(sysconfdir)/pear.conf*
- @mkdir -p $(DESTDIR)/opt/csw/bin
- @( cd $(DESTDIR)/opt/csw/bin; \
+post-install: AP2SYSCONF=$(sysconfdir_$(SAPI))/$(MM_LIBDIR)/httpd.conf
+post-install: AP2EXTCONF=$(sysconfdir_$(SAPI))/$(MM_LIBDIR)/extra
+post-install: INIDEST=$(DESTDIR)$(sysconfdir)/$(MM_LIBDIR)/php.ini
+post-install:
+ rm -f $(DESTDIR)$(AP2SYSCONF)
+ ginstall -d -m 0755 $(DESTDIR)$(AP2EXTCONF)
+ ginstall -m 0644 $(WORKDIR)/httpd-php5.conf $(DESTDIR)$(AP2EXTCONF)
+ ginstall -D -m 0644 $(WORKSRC)/php.ini-production $(INIDEST)
+ perl -pi -e 's/^;extension=php_(.*).dll/;extension=$$1.so/' $(INIDEST)
+ cat $(WORKDIR)/php.ini.patch | ed -s $(INIDEST)
+ ginstall -D -m 0755 $(WORKDIR)/phpext $(DESTDIR)$(bindir)/phpext
+ rm -rf $(DESTDIR)/.cha* $(DESTDIR)/.dep* $(DESTDIR)/.reg*
$(DESTDIR)/.l* $(DESTDIR)/.f*
+ perl -pi -e 's!s:17:"http://proxy:3128!s:0:";!'
$(DESTDIR)$(sysconfdir)/pear.conf*
+ mkdir -p $(DESTDIR)$(prefix)/bin/$(MM_BINDIR)
+ ( cd $(DESTDIR)$(prefix)/bin/$(MM_BINDIR); \
for f in pear peardev pecl phar php php-config; do \
- ln -s ../php5/bin/$$f $$f; \
+ ln -s $(if $(filter
64,$(MEMORYMODEL)),../../php5/bin/$(MM_BINDIR)/$$f,../php5/bin/$$f) $$f; \
done )
@$(MAKECOOKIE)
post-merge-all:
- @echo " ==> Fixing php.ini: adding loadable session.so ctype.so phar.so
support"
- cat $(WORKDIR)/php.ini.patch | ed -s
$(PKGROOT)/$(sysconfdir)/php.ini.CSW
+ gln -s . $(PKGROOT)$(libdir)/32
+ gln -s $(ISA_DEFAULT64) $(PKGROOT)$(libdir)/64
@$(MAKECOOKIE)
-post-merge-modulated:
- @echo "merge for $(SAPI)"
- @echo "preserve $(PRESERVECONF)"
- @$(MAKECOOKIE)
+
+#post-merge-all:
+# @echo " ==> Fixing php.ini: adding loadable session.so ctype.so phar.so
support"
+# cat $(WORKDIR)/php.ini.patch | ed -s
$(PKGROOT)/$(sysconfdir)/php.ini.CSW
+# @$(MAKECOOKIE)
+
Modified: csw/mgar/pkg/php5/branches/php-5.6.x/checksums
===================================================================
--- csw/mgar/pkg/php5/branches/php-5.6.x/checksums 2020-07-16 08:29:08 UTC
(rev 26680)
+++ csw/mgar/pkg/php5/branches/php-5.6.x/checksums 2020-07-17 14:36:26 UTC
(rev 26681)
@@ -1 +1 @@
-1e01c66b2e67ab3b56a6180ee560fe4c php-5.6.28.tar.xz
+c7dde3afb16ce7b761abf2805125d372 php-5.6.40.tar.xz
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
