--- a/components/php-5_2/APC/Makefile Fri Oct 10 10:07:08 2014 -0700
+++ b/components/php-5_2/APC/Makefile Thu Nov 20 15:41:15 2014 -0800
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
#
include ../../../make-rules/shared-macros.mk
@@ -38,6 +38,7 @@
--enable-apc-mmap
COMPONENT_POST_INSTALL_ACTION = ( \
+ set -e; \
$(MKDIR) $(PROTO_DIR)/$(APACHE2_SAMPLES_CONFDIR); \
$(INSTALL) -m 0644 $(COMPONENT_DIR)/../Solaris/php-apc-stats.conf \
$(PROTO_DIR)/$(APACHE2_SAMPLES_CONFDIR); \
--- a/components/php-5_2/common.mk Fri Oct 10 10:07:08 2014 -0700
+++ b/components/php-5_2/common.mk Thu Nov 20 15:41:15 2014 -0800
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
#
PHP_REL= 5.2
@@ -203,6 +203,7 @@
# We provide an .ini file for some extensions.
# Extensions without .ini's get handled below.
FIX_CONFIG_FILES = ( \
+ set -e; \
$(MKDIR) $(COMPONENT_DIR)/tmp; \
cd $(COMPONENT_DIR)/tmp; \
$(MKDIR) $(PROTO_DIR)/$(MODULES_CONFDIR); \
@@ -222,6 +223,7 @@
# By default, disable following 3rd party extensions:
# xdebug suhosin
FIX_CONFIG_FILES_2 = ( \
+ set -e; \
$(MKDIR) $(COMPONENT_DIR)/tmp; \
cd $(COMPONENT_DIR)/tmp; \
$(MKDIR) $(PROTO_DIR)/$(MODULES_CONFDIR); \
--- a/components/php-5_2/extensions-zts.mk Fri Oct 10 10:07:08 2014 -0700
+++ b/components/php-5_2/extensions-zts.mk Thu Nov 20 15:41:15 2014 -0800
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
#
include $(WS_TOP)/make-rules/prep.mk
@@ -35,6 +35,7 @@
# Patching PHP_EXECUTABLE will enable extensions to run the test target
#
COMPONENT_PRE_CONFIGURE_ACTION = ( \
+ set -e; \
($(CLONEY) $(SOURCE_DIR) $(@D)); \
$(GSED) -e "s@^builddir=.*@builddir=$(BUILD_DIR_32)@" \
< $(COMPONENT_DIR)/../php-nsapi/phpize-proto.zts \
@@ -69,10 +70,14 @@
# Manual dependency - need both php-sapi and php-nsapi installed
# before building a -zts extension.
../php-sapi/build/$(MACH32)/.installed:
- (cd ../php-sapi ; $(MAKE) install)
+ ( set -e; \
+ cd ../php-sapi; \
+ $(MAKE) install )
../php-nsapi/build/$(MACH32)/.installed:
- (cd ../php-nsapi ; $(MAKE) install)
+ ( set -e; \
+ cd ../php-nsapi; \
+ $(MAKE) install )
$(BUILD_DIR_32)/.configured: ../php-sapi/build/$(MACH32)/.installed
$(BUILD_DIR_32)/.configured: ../php-nsapi/build/$(MACH32)/.installed
--- a/components/php-5_2/extensions.mk Fri Oct 10 10:07:08 2014 -0700
+++ b/components/php-5_2/extensions.mk Thu Nov 20 15:41:15 2014 -0800
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
#
include $(WS_TOP)/make-rules/prep.mk
@@ -33,6 +33,7 @@
# Patching PHP_EXECUTABLE will enable extensions to run the test target
#
COMPONENT_PRE_CONFIGURE_ACTION = ( \
+ set -e; \
($(CLONEY) $(SOURCE_DIR) $(@D)); \
$(GSED) -e "s@^builddir=.*@builddir=$(BUILD_DIR_32)@" \
< $(COMPONENT_DIR)/../php-sapi/phpize-proto \
@@ -70,7 +71,9 @@
# Manual dependency
# Need $(COMPONENT_NAME)-zts installed before $(COMPONENT_NAME) publish
../$(COMPONENT_NAME)-zts/build/$(MACH32)/.installed:
- (cd ../$(COMPONENT_NAME)-zts ; $(MAKE) install)
+ ( set -e; \
+ cd ../$(COMPONENT_NAME)-zts; \
+ $(MAKE) install )
$(INSTALL_32): ../$(COMPONENT_NAME)-zts/build/$(MACH32)/.installed
--- a/components/php-5_2/idn/Makefile Fri Oct 10 10:07:08 2014 -0700
+++ b/components/php-5_2/idn/Makefile Thu Nov 20 15:41:15 2014 -0800
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
#
include ../../../make-rules/shared-macros.mk
@@ -36,6 +36,7 @@
CONFIGURE_OPTIONS += --with-idn
COMPONENT_POST_INSTALL_ACTION = ( \
+ set -e; \
$(FIX_CONFIG_FILES_2); \
)
--- a/components/php-5_2/imap/Makefile Fri Oct 10 10:07:08 2014 -0700
+++ b/components/php-5_2/imap/Makefile Thu Nov 20 15:41:15 2014 -0800
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
#
include ../../../make-rules/shared-macros.mk
@@ -44,6 +44,7 @@
CFLAGS += -D__USE_LEGACY_PROTOTYPES__
COMPONENT_BUILD_TARGETS = soc c-client
COMPONENT_POST_BUILD_ACTION = ( \
+ set -e; \
$(MV) $(BUILD_DIR_32)/c-client/c-client.a \
$(BUILD_DIR_32)/c-client/libc-client.a )
ENV += MAKE="$(GMAKE)"
--- a/components/php-5_2/memcache/Makefile Fri Oct 10 10:07:08 2014 -0700
+++ b/components/php-5_2/memcache/Makefile Thu Nov 20 15:41:15 2014 -0800
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
#
include ../../../make-rules/shared-macros.mk
@@ -39,6 +39,7 @@
--with-zlib-dir=/usr
COMPONENT_POST_INSTALL_ACTION = ( \
+ set -e; \
$(MKDIR) $(PROTO_DIR)/$(APACHE2_SAMPLES_CONFDIR); \
$(INSTALL) -m 0644 $(COMPONENT_DIR)/../Solaris/php-memcache-stats.conf \
$(PROTO_DIR)/$(APACHE2_SAMPLES_CONFDIR); \
--- a/components/php-5_2/php-nsapi/Makefile Fri Oct 10 10:07:08 2014 -0700
+++ b/components/php-5_2/php-nsapi/Makefile Thu Nov 20 15:41:15 2014 -0800
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
#
include ../../../make-rules/shared-macros.mk
@@ -54,6 +54,7 @@
include ../php-sapi/php.mk
COMPONENT_POST_UNPACK_ACTION += && ( \
+ set -e; \
$(RM) -r $(COMPONENT_DIR)/$(COMPONENT_SRC_1); \
cd $(COMPONENT_DIR); \
$(UNPACK) $(UNPACK_ARGS) ./$(COMPONENT_ARCHIVE_1); \
@@ -93,6 +94,7 @@
CONFIGURE_ENV += $(ZTS_CONF_ENVLINE)
COMPONENT_POST_BUILD_ACTION = ( \
+ set -e; \
cat $(BUILD_DIR_32)/scripts/phpize | \
sed -e "s,^\#!/bin/sh,\#!$(CONFIG_SHELL)," | \
sed -e "s%^prefix=.*%prefix=$(SOURCE_DIR)%" | \
@@ -104,12 +106,14 @@
chmod 755 phpize-proto.zts )
ADD_NSAPI_MODULE_SUPPORT = ( \
+ set -e; \
$(MKDIR) $(PROTO_DIR)/$(TOP_DIR)/nsapi/; \
$(CP) $(BUILD_DIR_32)/libs/libphp5.so \
$(PROTO_DIR)/$(TOP_DIR)/nsapi/libphp5.so; \
)
FIX_CONFIG_FILES = ( \
+ set -e; \
cd $(COMPONENT_DIR); \
$(GSED) -e "s@extension_dir = \(.*\)@extension_dir=$(PHP_ROOT_ZTS_EXT)@"< ../php-sapi/build/prototype/$(MACH)/$(CONFDIR)/php.ini > php.ini; \
$(MKDIR) $(PROTO_DIR)/$(NSAPI_CONFDIR); \
@@ -119,6 +123,7 @@
COMPONENT_INSTALL_TARGETS = libphp5.la install-modules
COMPONENT_POST_INSTALL_ACTION = ( \
+ set -e; \
$(ADD_NSAPI_MODULE_SUPPORT); \
$(FIX_CONFIG_FILES); \
)
--- a/components/php-5_2/php-sapi/Makefile Fri Oct 10 10:07:08 2014 -0700
+++ b/components/php-5_2/php-sapi/Makefile Thu Nov 20 15:41:15 2014 -0800
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
#
include ../../../make-rules/shared-macros.mk
@@ -85,6 +85,7 @@
CONFIGURE_ENV += $(CONF_ENVLINE)
COMPONENT_POST_BUILD_ACTION = ( \
+ set -e; \
cat $(BUILD_DIR_32)/scripts/phpize | \
sed -e "s,^\#!/bin/sh,\#!$(CONFIG_SHELL)," | \
sed -e "s%^prefix=.*%prefix=$(SOURCE_DIR)%" | \
@@ -97,13 +98,15 @@
sed -e "s%^builddir=.*%builddir=$(BUILD_DIR_32)%" \
> phpize-proto ; \
chmod 755 phpize-proto ) ; \
- ( cat $(BUILD_DIR_32)/scripts/php-config | \
+ ( set -e; \
+ cat $(BUILD_DIR_32)/scripts/php-config | \
sed -e "s,^\#! /bin/sh,\#!$(CONFIG_SHELL)," | \
sed -e "s%^prefix=.*%prefix=$(SOURCE_DIR)%" | \
sed -e "s%^include_dir=.*%include_dir=$(SOURCE_DIR)%" \
> php-config-proto ; \
chmod 755 php-config-proto ) ; \
- ( cat $(BUILD_DIR_32)/scripts/php-config | \
+ ( set -e; \
+ cat $(BUILD_DIR_32)/scripts/php-config | \
sed -e "s,^\#! /bin/sh,\#!$(CONFIG_SHELL)," | \
sed -e "s%^prefix=.*%prefix=$(COMPONENT_DIR)/../php-nsapi/$(COMPONENT_SRC)%" | \
sed -e "s%^include_dir=.*%include_dir=$(COMPONENT_DIR)/../php-nsapi/$(COMPONENT_SRC)%" | \
@@ -112,6 +115,7 @@
chmod 755 php-config-proto.zts )
ADD_APACHE2_MODULE_SUPPORT = ( \
+ set -e; \
$(MKDIR) $(PROTO_DIR)/$(APACHE2_PHP); \
$(CP) $(COMPONENT_DIR)/../Solaris/php$(PHP_REL).conf \
$(PROTO_DIR)/$(APACHE2_PHP)/php$(PHP_REL).conf; \
@@ -126,6 +130,7 @@
# Ship a default php.ini to simplify ease of use.
FIX_CONFIG_FILES = ( \
+ set -e; \
cd $(SOURCE_DIR); \
$(GPATCH) -p1 -o php.ini-patched -i ../patches-other/php_ini.patch; \
$(GSED) -e "s@<<VERSION>>@$(PHP_REL)@g" < php.ini-patched > php.ini; \
@@ -133,11 +138,13 @@
)
INSTALL_DOCS = ( \
+ set -e; \
$(MKDIR) $(PROTO_DIR)/$(DOCDIR); \
$(UNPACK) -r $(PROTO_DIR)/$(DOCDIR) $(COMPONENT_ARCHIVE_1); \
)
INSTALL_SAMPLES = ( \
+ set -e; \
$(MKDIR) $(PROTO_DIR)/$(SCRIPTS_DIR); \
$(MKDIR) $(COMPONENT_DIR)/tmp; \
cd $(COMPONENT_DIR); \
@@ -158,6 +165,7 @@
# patch installation to support pear installation.
PATCH_PEAR = ( \
+ set -e; \
cd $(PROTO_DIR)/$(PHP_BIN); \
$(GPATCH) -N -i $(COMPONENT_DIR)/patches-other/pear_pecl.patch; \
$(GPATCH) -N -i $(COMPONENT_DIR)/patches-other/pear_php_config.patch; \
@@ -172,6 +180,7 @@
# Create symbolic links
# Not strictly necessary but makes the proto area more correct.
CREATE_SYMLINKS = ( \
+ set -e; \
cd $(PROTO_DIR)/usr/php; \
$(RM) bin lib include modules doc man; \
$(SYMLINK) $(PHP_REL)/bin . ; \
@@ -189,6 +198,7 @@
)
COMPONENT_POST_INSTALL_ACTION = ( \
+ set -e; \
$(ADD_APACHE2_MODULE_SUPPORT); \
$(FIX_CONFIG_FILES); \
$(FIX_CONFIG_FILES_2); \
--- a/components/php-5_2/php-sapi/php.mk Fri Oct 10 10:07:08 2014 -0700
+++ b/components/php-5_2/php-sapi/php.mk Thu Nov 20 15:41:15 2014 -0800
@@ -18,17 +18,20 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
#
COMPONENT_PRE_INSTALL_ACTION += ( \
+ set -e; \
$(MKDIR) $(INSTALL_ROOT)/$(PHP_PEAR_CACHE_DIR) )
COMPONENT_POST_UNPACK_ACTION += ( \
+ set -e; \
echo $(PATH); \
cp /usr/include/zlib.h $(COMPONENT_SRC)/ext/zlib/my_zlib.h )
COMPONENT_PRE_CONFIGURE_ACTION = ( \
+ set -e; \
cd $(COMPONENT_SRC); $(ENV) -i PATH=/usr/gnu/bin:$(PATH) \
MAKE="$(GMAKE)" \
$(CONFIG_SHELL) ./buildconf --force ; \
--- a/components/php-5_2/suhosin/Makefile Fri Oct 10 10:07:08 2014 -0700
+++ b/components/php-5_2/suhosin/Makefile Thu Nov 20 15:41:15 2014 -0800
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
#
include ../../../make-rules/shared-macros.mk
@@ -36,6 +36,7 @@
CONFIGURE_OPTIONS += --enable-suhosin
COMPONENT_POST_INSTALL_ACTION = ( \
+ set -e; \
$(FIX_CONFIG_FILES); \
)
--- a/components/php-5_2/tcpwrap/Makefile Fri Oct 10 10:07:08 2014 -0700
+++ b/components/php-5_2/tcpwrap/Makefile Thu Nov 20 15:41:15 2014 -0800
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
#
include ../../../make-rules/shared-macros.mk
@@ -36,6 +36,7 @@
CONFIGURE_OPTIONS += --with-tcpwrap=/usr
COMPONENT_POST_INSTALL_ACTION = ( \
+ set -e; \
$(FIX_CONFIG_FILES_2); \
)
--- a/components/php-5_2/xdebug/Makefile Fri Oct 10 10:07:08 2014 -0700
+++ b/components/php-5_2/xdebug/Makefile Thu Nov 20 15:41:15 2014 -0800
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
#
include ../../../make-rules/shared-macros.mk
@@ -36,6 +36,7 @@
CONFIGURE_OPTIONS += --enable-xdebug
COMPONENT_POST_INSTALL_ACTION = ( \
+ set -e; \
$(FIX_CONFIG_FILES); \
)
--- a/components/php-5_3/APC/Makefile Fri Oct 10 10:07:08 2014 -0700
+++ b/components/php-5_3/APC/Makefile Thu Nov 20 15:41:15 2014 -0800
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
#
include ../../../make-rules/shared-macros.mk
@@ -38,6 +38,7 @@
--enable-apc-mmap
COMPONENT_POST_INSTALL_ACTION = ( \
+ set -e; \
$(MKDIR) $(PROTO_DIR)/$(APACHE2_SAMPLES_CONFDIR); \
$(INSTALL) -m 0644 $(COMPONENT_DIR)/../Solaris/php-apc-stats.conf \
$(PROTO_DIR)/$(APACHE2_SAMPLES_CONFDIR)/php$(PHP_REL)-apc-stats.conf; \
--- a/components/php-5_3/common.mk Fri Oct 10 10:07:08 2014 -0700
+++ b/components/php-5_3/common.mk Thu Nov 20 15:41:15 2014 -0800
@@ -203,6 +203,7 @@
# We provide an .ini file for some extensions.
# Extensions without .ini's get handled below.
FIX_CONFIG_FILES = ( \
+ set -e; \
$(MKDIR) $(COMPONENT_DIR)/tmp; \
cd $(COMPONENT_DIR)/tmp; \
$(MKDIR) $(PROTO_DIR)/$(MODULES_CONFDIR); \
@@ -221,6 +222,7 @@
# Create configuration files for those without.
FIX_CONFIG_FILES_2 = ( \
+ set -e; \
$(MKDIR) $(COMPONENT_DIR)/tmp; \
cd $(COMPONENT_DIR)/tmp; \
$(MKDIR) $(PROTO_DIR)/$(MODULES_CONFDIR); \
--- a/components/php-5_3/extensions-zts.mk Fri Oct 10 10:07:08 2014 -0700
+++ b/components/php-5_3/extensions-zts.mk Thu Nov 20 15:41:15 2014 -0800
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
#
include $(WS_TOP)/make-rules/prep.mk
@@ -35,6 +35,7 @@
# Patching PHP_EXECUTABLE will enable extensions to run the test target
#
COMPONENT_PRE_CONFIGURE_ACTION = ( \
+ set -e; \
($(CLONEY) $(SOURCE_DIR) $(@D)); \
$(GSED) -e "s@^builddir=.*@builddir=$(BUILD_DIR_32)@" \
< $(COMPONENT_DIR)/../php-nsapi/phpize-proto.zts \
@@ -69,10 +70,14 @@
# Manual dependency - need both php-sapi and php-nsapi installed
# before building a -zts extension.
../php-sapi/build/$(MACH32)/.installed:
- (cd ../php-sapi ; $(MAKE) install)
+ ( set -e; \
+ cd ../php-sapi; \
+ $(MAKE) install )
../php-nsapi/build/$(MACH32)/.installed:
- (cd ../php-nsapi ; $(MAKE) install)
+ ( set -e; \
+ cd ../php-nsapi; \
+ $(MAKE) install )
$(BUILD_DIR_32)/.configured: ../php-sapi/build/$(MACH32)/.installed
$(BUILD_DIR_32)/.configured: ../php-nsapi/build/$(MACH32)/.installed
--- a/components/php-5_3/extensions.mk Fri Oct 10 10:07:08 2014 -0700
+++ b/components/php-5_3/extensions.mk Thu Nov 20 15:41:15 2014 -0800
@@ -33,6 +33,7 @@
# Patching PHP_EXECUTABLE will enable extensions to run the test target
#
COMPONENT_PRE_CONFIGURE_ACTION = ( \
+ set -e; \
($(CLONEY) $(SOURCE_DIR) $(@D)); \
$(GSED) -e "s@^builddir=.*@builddir=$(BUILD_DIR_32)@" \
< $(COMPONENT_DIR)/../php-sapi/phpize-proto \
@@ -69,7 +70,9 @@
# Manual dependency
# Need $(COMPONENT_NAME)-zts installed before $(COMPONENT_NAME) publish
../$(COMPONENT_NAME)-zts/build/$(MACH32)/.installed:
- (cd ../$(COMPONENT_NAME)-zts ; $(MAKE) install)
+ ( set -e; \
+ cd ../$(COMPONENT_NAME)-zts; \
+ $(MAKE) install )
$(INSTALL_32): ../$(COMPONENT_NAME)-zts/build/$(MACH32)/.installed
--- a/components/php-5_3/idn/Makefile Fri Oct 10 10:07:08 2014 -0700
+++ b/components/php-5_3/idn/Makefile Thu Nov 20 15:41:15 2014 -0800
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
#
include ../../../make-rules/shared-macros.mk
@@ -36,6 +36,7 @@
CONFIGURE_OPTIONS += --with-idn
COMPONENT_POST_INSTALL_ACTION = ( \
+ set -e; \
$(FIX_CONFIG_FILES_2); \
)
--- a/components/php-5_3/imap/Makefile Fri Oct 10 10:07:08 2014 -0700
+++ b/components/php-5_3/imap/Makefile Thu Nov 20 15:41:15 2014 -0800
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
#
include ../../../make-rules/shared-macros.mk
@@ -42,6 +42,7 @@
COMPONENT_BUILD_TARGETS = soc c-client
COMPONENT_POST_BUILD_ACTION = ( \
+ set -e; \
$(MV) $(BUILD_DIR_32)/c-client/c-client.a \
$(BUILD_DIR_32)/c-client/libc-client.a )
ENV += MAKE="$(GMAKE)"
--- a/components/php-5_3/memcache/Makefile Fri Oct 10 10:07:08 2014 -0700
+++ b/components/php-5_3/memcache/Makefile Thu Nov 20 15:41:15 2014 -0800
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
#
include ../../../make-rules/shared-macros.mk
@@ -39,6 +39,7 @@
--with-zlib-dir=/usr
COMPONENT_POST_INSTALL_ACTION = ( \
+ set -e; \
$(MKDIR) $(PROTO_DIR)/$(APACHE2_SAMPLES_CONFDIR); \
$(MKDIR) $(COMPONENT_DIR)/tmp; \
$(INSTALL) -m 0644 $(COMPONENT_DIR)/../Solaris/php-memcache-stats.conf \
--- a/components/php-5_3/php-nsapi/Makefile Fri Oct 10 10:07:08 2014 -0700
+++ b/components/php-5_3/php-nsapi/Makefile Thu Nov 20 15:41:15 2014 -0800
@@ -57,6 +57,7 @@
include ../common.mk
COMPONENT_POST_UNPACK_ACTION += && ( \
+ set -e; \
$(RM) -r $(COMPONENT_DIR)/$(COMPONENT_SRC_1); \
cd $(COMPONENT_DIR); \
$(UNPACK) $(UNPACK_ARGS) ./$(COMPONENT_ARCHIVE_1); \
@@ -96,6 +97,7 @@
CONFIGURE_ENV += $(ZTS_CONF_ENVLINE)
COMPONENT_POST_BUILD_ACTION = ( \
+ set -e; \
cat $(BUILD_DIR_32)/scripts/phpize | \
sed -e "s,^\#!/bin/sh,\#!$(CONFIG_SHELL)," | \
sed -e "s%^prefix=.*%prefix=$(BUILD_DIR_32)%" | \
@@ -107,12 +109,14 @@
chmod 755 phpize-proto.zts )
ADD_NSAPI_MODULE_SUPPORT = ( \
+ set -e; \
$(MKDIR) $(PROTO_DIR)/$(TOP_DIR)/nsapi/; \
$(CP) $(BUILD_DIR_32)/libs/libphp5.so \
$(PROTO_DIR)/$(TOP_DIR)/nsapi/libphp5.so; \
)
FIX_CONFIG_FILES = ( \
+ set -e; \
cd $(COMPONENT_DIR); \
$(GSED) -e "s@extension_dir = \(.*\)@extension_dir=$(PHP_ROOT_ZTS_EXT)@"< ../php-sapi/build/prototype/$(MACH)/$(CONFDIR)/php.ini > php.ini; \
$(MKDIR) $(PROTO_DIR)/$(NSAPI_CONFDIR); \
@@ -122,6 +126,7 @@
COMPONENT_INSTALL_TARGETS = libphp5.la install-modules
COMPONENT_POST_INSTALL_ACTION = ( \
+ set -e; \
$(ADD_NSAPI_MODULE_SUPPORT); \
$(FIX_CONFIG_FILES); \
)
--- a/components/php-5_3/php-sapi/Makefile Fri Oct 10 10:07:08 2014 -0700
+++ b/components/php-5_3/php-sapi/Makefile Thu Nov 20 15:41:15 2014 -0800
@@ -100,6 +100,7 @@
CONFIGURE_ENV += $(CONF_ENVLINE)
COMPONENT_POST_BUILD_ACTION = ( \
+ set -e; \
cat $(BUILD_DIR_32)/scripts/phpize | \
sed -e "s,^\#!/bin/sh,\#!$(CONFIG_SHELL)," | \
sed -e "s%^prefix=.*%prefix=$(BUILD_DIR_32)%" | \
@@ -112,13 +113,15 @@
sed -e "s%^builddir=.*%builddir=$(BUILD_DIR_32)%" \
> phpize-proto ; \
chmod 755 phpize-proto ) ; \
- ( cat $(BUILD_DIR_32)/scripts/php-config | \
+ ( set -e; \
+ cat $(BUILD_DIR_32)/scripts/php-config | \
sed -e "s,^\#! /bin/sh,\#!$(CONFIG_SHELL)," | \
sed -e "s%^prefix=.*%prefix=$(BUILD_DIR_32)%" | \
sed -e "s%^include_dir=.*%include_dir=$(BUILD_DIR_32)%" \
> php-config-proto ; \
chmod 755 php-config-proto ) ; \
- ( cat $(BUILD_DIR_32)/scripts/php-config | \
+ ( set -e; \
+ cat $(BUILD_DIR_32)/scripts/php-config | \
sed -e "s,^\#! /bin/sh,\#!$(CONFIG_SHELL)," | \
sed -e "s%^prefix=.*%prefix=$(COMPONENT_DIR)/../php-nsapi/$(COMPONENT_SRC)%" | \
sed -e "s%^include_dir=.*%include_dir=$(COMPONENT_DIR)/../php-nsapi/$(COMPONENT_SRC)%" | \
@@ -127,6 +130,7 @@
chmod 755 php-config-proto.zts )
ADD_APACHE2_MODULE_SUPPORT = ( \
+ set -e; \
$(MKDIR) $(PROTO_DIR)/$(APACHE2_PHP); \
$(INSTALL) -m 0644 $(COMPONENT_DIR)/../Solaris/php$(PHP_REL).conf \
$(PROTO_DIR)/$(APACHE2_PHP)/php$(PHP_REL).conf; \
@@ -139,19 +143,26 @@
)
# Ship a default php.ini to simplify ease of use.
+# Replace the php.ini-production symlink with a copy of the real file because
+# gpatch no longer follows symlinks.
FIX_CONFIG_FILES = ( \
+ set -e; \
cd $(BUILD_DIR_32); \
+ $(RM) php.ini-production; \
+ $(CP) $(SOURCE_DIR)/php.ini-production .; \
$(GPATCH) -p0 -o php.ini-patched -i ../../patches-other/php_ini.patch; \
$(GSED) -e "s@<<VERSION>>@$(PHP_REL)@g" < php.ini-patched > php.ini; \
$(INSTALL) -m 644 php.ini $(PROTO_DIR)/$(CONF_DIR)/php.ini; \
)
INSTALL_DOCS = ( \
+ set -e; \
$(MKDIR) $(PROTO_DIR)/$(DOCDIR); \
$(UNPACK) -r $(PROTO_DIR)/$(DOCDIR) $(COMPONENT_ARCHIVE_1); \
)
INSTALL_SAMPLES = ( \
+ set -e; \
$(MKDIR) $(PROTO_DIR)/$(SCRIPTS_DIR); \
$(MKDIR) $(COMPONENT_DIR)/tmp; \
cd $(COMPONENT_DIR); \
@@ -172,6 +183,7 @@
# patch installation to support pear installation.
PATCH_PEAR = ( \
+ set -e; \
cd $(PROTO_DIR)/$(PHP_BIN); \
$(GPATCH) -N -i $(COMPONENT_DIR)/patches-other/pear_pecl.patch; \
$(GPATCH) -N -i $(COMPONENT_DIR)/patches-other/pear_php_config.patch; \
@@ -186,6 +198,7 @@
# Create symbolic links
# Not strictly necessary but makes the proto area more correct.
CREATE_SYMLINKS = ( \
+ set -e; \
cd $(PROTO_DIR)/usr/php; \
$(RM) bin lib include modules doc man; \
$(SYMLINK) $(PHP_REL)/bin . ; \
@@ -204,6 +217,7 @@
)
COMPONENT_POST_INSTALL_ACTION = ( \
+ set -e; \
$(ADD_APACHE2_MODULE_SUPPORT); \
$(FIX_CONFIG_FILES); \
$(FIX_CONFIG_FILES_2); \
--- a/components/php-5_3/php-sapi/php.mk Fri Oct 10 10:07:08 2014 -0700
+++ b/components/php-5_3/php-sapi/php.mk Thu Nov 20 15:41:15 2014 -0800
@@ -22,12 +22,14 @@
#
COMPONENT_PRE_INSTALL_ACTION += ( \
+ set -e; \
$(MKDIR) $(INSTALL_ROOT)/$(PHP_PEAR_CACHE_DIR) )
#
# Removing Zend/*parser.[ch] forces regeneration by native bison
#
COMPONENT_POST_UNPACK_ACTION += ( \
+ set -e; \
echo $(PATH); \
$(CP) /usr/include/zlib.h $(COMPONENT_SRC)/ext/zlib/my_zlib.h; \
$(RM) $(COMPONENT_SRC)/Zend/zend_ini_parser.c \
@@ -40,6 +42,7 @@
PATCHES = $(shell cd $(PATCH_DIR); echo [0-9]* $$(MACH)* )
COMPONENT_PRE_CONFIGURE_ACTION = ( \
+ set -e; \
cd $(COMPONENT_SRC); $(ENV) -i PATH=/usr/gnu/bin:$(PATH) \
MAKE="$(GMAKE)" \
$(CONFIG_SHELL) ./buildconf --force ; \
--- a/components/php-5_3/suhosin/Makefile Fri Oct 10 10:07:08 2014 -0700
+++ b/components/php-5_3/suhosin/Makefile Thu Nov 20 15:41:15 2014 -0800
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
#
include ../../../make-rules/shared-macros.mk
@@ -36,6 +36,7 @@
CONFIGURE_OPTIONS += --enable-suhosin
COMPONENT_POST_INSTALL_ACTION = ( \
+ set -e; \
$(FIX_CONFIG_FILES); \
)
--- a/components/php-5_3/tcpwrap/Makefile Fri Oct 10 10:07:08 2014 -0700
+++ b/components/php-5_3/tcpwrap/Makefile Thu Nov 20 15:41:15 2014 -0800
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
#
include ../../../make-rules/shared-macros.mk
@@ -39,6 +39,7 @@
CONFIGURE_OPTIONS += --with-tcpwrap=/usr
COMPONENT_POST_INSTALL_ACTION = ( \
+ set -e; \
$(FIX_CONFIG_FILES_2); \
)
--- a/components/php-5_3/xdebug/Makefile Fri Oct 10 10:07:08 2014 -0700
+++ b/components/php-5_3/xdebug/Makefile Thu Nov 20 15:41:15 2014 -0800
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
#
include ../../../make-rules/shared-macros.mk
@@ -40,6 +40,7 @@
CONFIGURE_OPTIONS += --enable-xdebug
COMPONENT_POST_INSTALL_ACTION = ( \
+ set -e; \
$(FIX_CONFIG_FILES); \
)
--- a/components/php-5_3/zendopcache/Makefile Fri Oct 10 10:07:08 2014 -0700
+++ b/components/php-5_3/zendopcache/Makefile Thu Nov 20 15:41:15 2014 -0800
@@ -40,6 +40,7 @@
COMPONENT_PREP_ACTION += $(call cleancr,$(SOURCE_DIR)/Optimizer/zend_optimizer.h)
COMPONENT_POST_INSTALL_ACTION = ( \
+ set -e; \
$(FIX_CONFIG_FILES) \
)