diff -r 6826bd655a25 -r 649b12aa87ce components/php-5_3/php-nsapi/Makefile --- a/components/php-5_3/php-nsapi/Makefile Fri Apr 18 06:38:30 2014 -0700 +++ b/components/php-5_3/php-nsapi/Makefile Fri Apr 18 11:03:12 2014 -0700 @@ -18,17 +18,17 @@ # # CDDL HEADER END # -# Copyright (c) 2012, 2013, 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 COMPONENT_NAME= php -COMPONENT_VERSION= 5.3.27 +COMPONENT_VERSION= 5.3.28 COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION) COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.bz2 COMPONENT_ARCHIVE_HASH= \ - sha256:e12db21c623b82a2244c4dd9b06bb75af20868c1b748a105a6829a5acc36b287 + sha256:0cac960c651c4fbb3d21cf2f2b279a06e21948fb35a0d1439b97296cac1d8513 COMPONENT_ARCHIVE_URL= http://us.php.net/get/$(COMPONENT_ARCHIVE)/from/this/mirror COMPONENT_PROJECT_URL= http://www.php.net/ @@ -48,12 +48,13 @@ PATCH_DIR = ../php-sapi/patches +include ../php-sapi/php.mk + include $(WS_TOP)/make-rules/prep.mk include $(WS_TOP)/make-rules/configure.mk include $(WS_TOP)/make-rules/ips.mk include ../common.mk -include ../php-sapi/php.mk COMPONENT_POST_UNPACK_ACTION += && ( \ $(RM) -r $(COMPONENT_DIR)/$(COMPONENT_SRC_1); \ @@ -97,9 +98,9 @@ COMPONENT_POST_BUILD_ACTION = ( \ cat $(BUILD_DIR_32)/scripts/phpize | \ sed -e "s,^\#!/bin/sh,\#!$(CONFIG_SHELL)," | \ - sed -e "s%^prefix=.*%prefix=$(SOURCE_DIR)%" | \ - sed -e "s%^includedir=.*%includedir=$(SOURCE_DIR)%" | \ - sed -e "s%^phpdir=.*%phpdir=$(SOURCE_DIR)%" | \ + sed -e "s%^prefix=.*%prefix=$(BUILD_DIR_32)%" | \ + sed -e "s%^includedir=.*%includedir=$(BUILD_DIR_32)%" | \ + sed -e "s%^phpdir=.*%phpdir=$(BUILD_DIR_32)%" | \ sed -e "s%phpdir/phpize.m4%phpdir/scripts/phpize.m4%" | \ sed -e 's%cd "$$phpdir" && cp $$FILES_BUILD "$$builddir"/build%cd "$$phpdir/build" \&\& cp $$FILES_BUILD "$$builddir"/build%' \ > phpize-proto.zts ; \