diff -r 6826bd655a25 -r 649b12aa87ce components/php-5_3/php-sapi/Makefile --- a/components/php-5_3/php-sapi/Makefile Fri Apr 18 06:38:30 2014 -0700 +++ b/components/php-5_3/php-sapi/Makefile Fri Apr 18 11:03:12 2014 -0700 @@ -18,7 +18,7 @@ # # 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 @@ -29,11 +29,11 @@ # published from. 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/ @@ -57,12 +57,14 @@ # will pick it up. COMPONENT_ARCHIVE_URL_1=http://us.php.net/get/$(COMPONENT_ARCHIVE_1)/from/this/mirror +include ./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.mk CONFIGURE_OPTIONS += \ $(COMMON_CONFIG_OPTIONS) \ @@ -100,9 +102,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%$PHP_AUTOCONF || exit 1%$PHP_AUTOCONF -f || exit 1%" | \ sed -e "s%$PHP_AUTOHEADER || exit 1%$PHP_AUTOHEADER -f || exit 1%" | \ @@ -112,8 +114,8 @@ chmod 755 phpize-proto ) ; \ ( 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)%" \ + 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 | \ @@ -138,8 +140,8 @@ # Ship a default php.ini to simplify ease of use. FIX_CONFIG_FILES = ( \ - cd $(SOURCE_DIR); \ - $(GPATCH) -p0 -o php.ini-patched -i ../patches-other/php_ini.patch; \ + cd $(BUILD_DIR_32); \ + $(GPATCH) -p0 -o php.ini-patched -i ../../patches-other/php_ini.patch; \ $(GSED) -e "s@<>@$(PHP_REL)@g" < php.ini-patched > php.ini; \ $(INSTALL) -m 644 php.ini $(PROTO_DIR)/$(CONF_DIR)/php.ini; \ )