20854739 the phps do not build on s12-71
20460992 PHP should have some master test results to compare against
--- a/components/php-5_3/APC-zts/Makefile Thu Apr 23 06:52:22 2015 -0700
+++ b/components/php-5_3/APC-zts/Makefile Thu Apr 23 09:28:44 2015 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
#
include ../../../make-rules/shared-macros.mk
@@ -38,3 +38,9 @@
CONFIGURE_OPTIONS += \
--enable-apc \
--enable-apc-mmap
+
+# test failures; keep going
+COMPONENT_TEST_ARGS += -k -i
+
+# different results for different architectures
+COMPONENT_TEST_MASTER = $(COMPONENT_TEST_RESULTS_DIR)/results-$(MACH$(BITS)).master
--- a/components/php-5_3/APC/Makefile Thu Apr 23 06:52:22 2015 -0700
+++ b/components/php-5_3/APC/Makefile Thu Apr 23 09:28:44 2015 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
#
include ../../../make-rules/shared-macros.mk
@@ -51,3 +51,9 @@
$(FIX_CONFIG_FILES)
PKG_PROTO_DIRS += $(COMPONENT_DIR)/../APC-zts/build/prototype/$(MACH)
+
+# test failures; keep going
+COMPONENT_TEST_ARGS += -k -i
+
+# different results for different architectures
+COMPONENT_TEST_MASTER = $(COMPONENT_TEST_RESULTS_DIR)/results-$(MACH$(BITS)).master
--- a/components/php-5_3/common.mk Thu Apr 23 06:52:22 2015 -0700
+++ b/components/php-5_3/common.mk Thu Apr 23 09:28:44 2015 -0700
@@ -237,3 +237,27 @@
$(PROTO_DIR)/$(ZTS_MODULES_CONFDIR)/$${ext}.ini; \
done; \
)
+
+# See php-cgi/Makefile, php-nsapi/Makefile, php-sapi/Makefile for further
+# notes about testing php.
+
+# Test transforms to delete references to:
+# remove everything before the first '============'
+# ============================================================
+# machine names and version
+# PHP_OS : SunOS - SunOS slitheen 5.12 s12_70 sun4v
+# time
+# TIME START 2015-04-14 01:21:42
+# Time taken : 2410 seconds
+# path to php
+# PHP : /builds/cmohrman/userland_defau...
+# the last output line
+# make[2]: Leaving directory `$(@D)'
+
+COMPONENT_TEST_TRANSFORMS += \
+ '-e "1,/^==========/d"' \
+ '-e "s/^PHP_OS.*$$//"' \
+ '-e "s/^TIME.*$$//"' \
+ '-e "s/^Time.*$$//"' \
+ '-e "s/^PHP .*$$//"' \
+ '-e "\$$d"'
--- a/components/php-5_3/php-cgi/Makefile Thu Apr 23 06:52:22 2015 -0700
+++ b/components/php-5_3/php-cgi/Makefile Thu Apr 23 09:28:44 2015 -0700
@@ -54,16 +54,33 @@
COMPONENT_INSTALL_TARGETS = install-sapi
-# common targets
+# Test results not quite stable but good enough for human eyes
+$(SKIP_TEST_AT_TOP_LEVEL)
+
configure: $(CONFIGURE_32)
build: $(BUILD_32)
install: $(INSTALL_32)
+# These test and compare results are not quite stable enough
+# to use in automated testing but good enough to eye
+# ball and get a sense that php is working correctly.
+# Individual tests can be run afterwards.
+# Several random tests may PASS/FAIL on each run thus invalidating
+# test and compare results.
+# To use the master test result file do:
+# $ gmake build
+# $ gmake -i -k test
+# because very likely the comparison phase will fail.
+
+# test failures; keep going
+COMPONENT_TEST_ARGS += -k -i
+
+# different results for different architectures
+COMPONENT_TEST_MASTER = $(COMPONENT_TEST_RESULTS_DIR)/results-$(MACH$(BITS)).master
+
test: $(TEST_32)
# php-sapi does the publish
publish: install
-
-
--- a/components/php-5_3/php-nsapi/Makefile Thu Apr 23 06:52:22 2015 -0700
+++ b/components/php-5_3/php-nsapi/Makefile Thu Apr 23 09:28:44 2015 -0700
@@ -133,16 +133,33 @@
CLEAN_PATHS += webserver7-spi phpize-proto.zts php.ini
-# common targets
+# Test results not quite stable but good enough for human eyes
+$(SKIP_TEST_AT_TOP_LEVEL)
+
configure: $(CONFIGURE_32)
build: $(BUILD_32)
install: $(INSTALL_32)
+# These test and compare results are not quite stable enough
+# to use in automated testing but good enough to eye
+# ball and get a sense that php is working correctly.
+# Individual tests can be run afterwards.
+# Several random tests may PASS/FAIL on each run thus invalidating
+# test and compare results.
+# To use the master test result file do:
+# $ gmake build
+# $ gmake -i -k test
+# because very likely the comparison phase will fail.
+
+# test failures; keep going
+COMPONENT_TEST_ARGS += -k -i
+
+# different results for different architectures
+COMPONENT_TEST_MASTER = $(COMPONENT_TEST_RESULTS_DIR)/results-$(MACH$(BITS)).master
+
test: $(TEST_32)
# php-sapi does the publish
publish: install
-
-
--- a/components/php-5_3/php-sapi/Makefile Thu Apr 23 06:52:22 2015 -0700
+++ b/components/php-5_3/php-sapi/Makefile Thu Apr 23 09:28:44 2015 -0700
@@ -235,17 +235,37 @@
CLEAN_PATHS += phpize-proto php-config-proto php-config-proto.zts tmp
CLEAN_PATHS += php.ini-patched
-# common targets
+# Test results not quite stable but good enough for human eyes
+$(SKIP_TEST_AT_TOP_LEVEL)
+
configure: $(CONFIGURE_32)
build: $(BUILD_32)
install: $(INSTALL_32) PHP-NSAPI_INSTALL PHP-CGI_INSTALL
-# Besides running this test target it is also strong advised to download
+# Besides running this test target it is also strongly advised to download
# and test with:
# Joomla! http://www.joomla.org/
# WordPress http://wordpress.org/
+
+# These test and compare results are not quite stable enough
+# to use in automated testing but good enough to eye
+# ball and get a sense that php is working correctly.
+# Individual tests can be run afterwards.
+# Several random tests may PASS/FAIL on each run thus invalidating
+# test and compare results.
+# To use the master test result file do:
+# $ gmake build
+# $ gmake -i -k test
+# because very likely the comparison phase will fail.
+
+# test failures; keep going
+COMPONENT_TEST_ARGS += -k -i
+
+# different results for different architectures
+COMPONENT_TEST_MASTER = $(COMPONENT_TEST_RESULTS_DIR)/results-$(MACH$(BITS)).master
+
test: $(TEST_32)
../imap/build/$(MACH32)/.built:
@@ -260,5 +280,3 @@
$(BUILD_DIR_32)/.configured: ../imap/build/$(MACH32)/.built
PHP-NSAPI_INSTALL: ../php-nsapi/build/$(MACH32)/.installed
PHP-CGI_INSTALL: ../php-cgi/build/$(MACH32)/.installed
-
-
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/php-5_3/php-sapi/patches/230_php-ext-gd.patch Thu Apr 23 09:28:44 2015 -0700
@@ -0,0 +1,15 @@
+20854739 the phps do not build
+This fix will not be sent upstream since this version has been EOF
+by the community.
+
+--- php-5.3.29/ext/gd/config.m4_orig 2014-08-13 12:22:50.000000000 -0700
++++ php-5.3.29/ext/gd/config.m4 2015-04-15 11:35:17.456859370 -0700
+@@ -162,7 +162,7 @@
+ if test "$PHP_FREETYPE_DIR" != "no"; then
+
+ for i in $PHP_FREETYPE_DIR /usr/local /usr; do
+- if test -f "$i/include/freetype2/freetype/freetype.h"; then
++ if test -f "$i/include/freetype2/freetype.h" || test -f "$i/include/freetype2/freetype/freetype.h"; then
+ FREETYPE2_DIR=$i
+ FREETYPE2_INC_DIR=$i/include/freetype2
+ break
--- a/components/php-5_3/suhosin-zts/Makefile Thu Apr 23 06:52:22 2015 -0700
+++ b/components/php-5_3/suhosin-zts/Makefile Thu Apr 23 09:28:44 2015 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
#
include ../../../make-rules/shared-macros.mk
@@ -34,3 +34,6 @@
include ../extensions-zts.mk
CONFIGURE_OPTIONS += --enable-suhosin
+
+# test failures; keep going
+COMPONENT_TEST_ARGS += -k -i
--- a/components/php-5_3/suhosin/Makefile Thu Apr 23 06:52:22 2015 -0700
+++ b/components/php-5_3/suhosin/Makefile Thu Apr 23 09:28:44 2015 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
#
include ../../../make-rules/shared-macros.mk
@@ -41,3 +41,6 @@
)
PKG_PROTO_DIRS += $(COMPONENT_DIR)/../suhosin-zts/build/prototype/$(MACH)
+
+# test failures; keep going
+COMPONENT_TEST_ARGS += -k -i