equal
deleted
inserted
replaced
16 # fields enclosed by brackets "[]" replaced with your own identifying |
16 # fields enclosed by brackets "[]" replaced with your own identifying |
17 # information: Portions Copyright [yyyy] [name of copyright owner] |
17 # information: Portions Copyright [yyyy] [name of copyright owner] |
18 # |
18 # |
19 # CDDL HEADER END |
19 # CDDL HEADER END |
20 # |
20 # |
21 # Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved. |
21 # Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. |
22 # |
22 # |
23 |
23 |
24 include $(WS_TOP)/make-rules/prep.mk |
24 include $(WS_TOP)/make-rules/prep.mk |
25 include $(WS_TOP)/make-rules/configure.mk |
25 include $(WS_TOP)/make-rules/configure.mk |
26 include $(WS_TOP)/make-rules/ips.mk |
26 include $(WS_TOP)/make-rules/ips.mk |
31 # phpize-proto runs autoconf |
31 # phpize-proto runs autoconf |
32 # |
32 # |
33 # Patching PHP_EXECUTABLE will enable extensions to run the test target |
33 # Patching PHP_EXECUTABLE will enable extensions to run the test target |
34 # |
34 # |
35 COMPONENT_PRE_CONFIGURE_ACTION = ( \ |
35 COMPONENT_PRE_CONFIGURE_ACTION = ( \ |
|
36 set -e; \ |
36 ($(CLONEY) $(SOURCE_DIR) $(@D)); \ |
37 ($(CLONEY) $(SOURCE_DIR) $(@D)); \ |
37 $(GSED) -e "s@^builddir=.*@builddir=$(BUILD_DIR_32)@" \ |
38 $(GSED) -e "s@^builddir=.*@builddir=$(BUILD_DIR_32)@" \ |
38 < $(COMPONENT_DIR)/../php-sapi/phpize-proto \ |
39 < $(COMPONENT_DIR)/../php-sapi/phpize-proto \ |
39 > $(COMPONENT_DIR)/phpize-proto; \ |
40 > $(COMPONENT_DIR)/phpize-proto; \ |
40 cd $(BUILD_DIR_32); \ |
41 cd $(BUILD_DIR_32); \ |
68 $(BUILD_DIR_32)/.configured: ../php-sapi/build/$(MACH32)/.installed |
69 $(BUILD_DIR_32)/.configured: ../php-sapi/build/$(MACH32)/.installed |
69 |
70 |
70 # Manual dependency |
71 # Manual dependency |
71 # Need $(COMPONENT_NAME)-zts installed before $(COMPONENT_NAME) publish |
72 # Need $(COMPONENT_NAME)-zts installed before $(COMPONENT_NAME) publish |
72 ../$(COMPONENT_NAME)-zts/build/$(MACH32)/.installed: |
73 ../$(COMPONENT_NAME)-zts/build/$(MACH32)/.installed: |
73 (cd ../$(COMPONENT_NAME)-zts ; $(MAKE) install) |
74 ( set -e; \ |
|
75 cd ../$(COMPONENT_NAME)-zts; \ |
|
76 $(MAKE) install ) |
74 |
77 |
75 $(INSTALL_32): ../$(COMPONENT_NAME)-zts/build/$(MACH32)/.installed |
78 $(INSTALL_32): ../$(COMPONENT_NAME)-zts/build/$(MACH32)/.installed |
76 |
79 |
77 |
80 |
78 BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) |
81 BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) |