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, 2013, Oracle and/or its affiliates. All rights reserved. |
22 # |
22 # |
23 include ../../make-rules/shared-macros.mk |
23 include ../../make-rules/shared-macros.mk |
24 |
24 |
25 COMPONENT_NAME= bash |
25 COMPONENT_NAME= bash |
26 COMPONENT_VERSION= 4.2 |
26 COMPONENT_VERSION= 4.2 |
34 |
34 |
35 include ../../make-rules/prep.mk |
35 include ../../make-rules/prep.mk |
36 include ../../make-rules/configure.mk |
36 include ../../make-rules/configure.mk |
37 include ../../make-rules/ips.mk |
37 include ../../make-rules/ips.mk |
38 |
38 |
39 IPS_COMPONENT_VERSION = $(COMPONENT_VERSION).9 |
39 IPS_COMPONENT_VERSION = $(COMPONENT_VERSION).45 |
40 PATCH_LEVEL = 0 |
40 PATCH_LEVEL = 0 |
41 |
41 |
42 PKG_PROTO_DIRS += $(COMPONENT_DIR)/Solaris |
42 PKG_PROTO_DIRS += $(COMPONENT_DIR)/Solaris |
43 |
43 |
44 # Enable C99 mode + -Xc for it's additional warnings. |
44 # Enable C99 mode + -Xc for it's additional warnings. |
47 # Use the maximum number of registers on sparc since we have no libraries |
47 # Use the maximum number of registers on sparc since we have no libraries |
48 studio_XREGS.sparc = -xregs=appl |
48 studio_XREGS.sparc = -xregs=appl |
49 |
49 |
50 # 8 byte memory alignment + interpretation of non-alignment instead of SIGBUS |
50 # 8 byte memory alignment + interpretation of non-alignment instead of SIGBUS |
51 studio_ALIGN.sparc.32 = -xmemalign=8i |
51 studio_ALIGN.sparc.32 = -xmemalign=8i |
|
52 studio_ALIGN.sparc.64 = -xmemalign=16i |
52 |
53 |
53 # -xinline=%auto -- we like inlining where appropriate |
54 # -xinline=%auto -- we like inlining where appropriate |
54 CFLAGS += -xinline=%auto |
55 CFLAGS += -xinline=%auto |
55 |
56 |
56 # -xbuiltin=%none -- builtins have been known to be buggy |
57 # -xbuiltin=%none -- builtins have been known to be buggy |
67 |
68 |
68 # -z redlocsym -- let's shrink the SHT_SYMTAB as much as we can |
69 # -z redlocsym -- let's shrink the SHT_SYMTAB as much as we can |
69 LDFLAGS = $(LD_Z_REDLOCSYM) |
70 LDFLAGS = $(LD_Z_REDLOCSYM) |
70 |
71 |
71 # The bash test harness needs the GNU userland utilities |
72 # The bash test harness needs the GNU userland utilities |
72 TEST_PATH = "PATH=$(BUILD_DIR_32):$(GNUBIN):$(USRBINDIR)" |
73 TEST_PATH = "PATH=$(BUILD_DIR_64):$(GNUBIN):$(USRBINDIR)" |
73 TEST_OUTPUT = $(COMPONENT_DIR)/bash_test_results_$(MACH).out |
74 TEST_OUTPUT = $(COMPONENT_DIR)/bash_test_results_$(MACH).out |
74 |
75 |
75 CONFIGURE_ENV += CFLAGS="$(CFLAGS)" |
76 CONFIGURE_ENV += CFLAGS="$(CFLAGS)" |
76 CONFIGURE_ENV += LDFLAGS="$(LDFLAGS)" |
77 CONFIGURE_ENV += LDFLAGS="$(LDFLAGS)" |
77 CONFIGURE_ENV += LIBS="$(LIBS)" |
78 CONFIGURE_ENV += LIBS="$(LIBS)" |
121 |
122 |
122 TEST_ENV += -i |
123 TEST_ENV += -i |
123 TEST_ENV += $(TEST_PATH) |
124 TEST_ENV += $(TEST_PATH) |
124 TEST_ENV += $(TARGET_ENV) |
125 TEST_ENV += $(TARGET_ENV) |
125 |
126 |
126 build: $(BUILD_32) |
127 ASLR_MODE=$(ASLR_ENABLE) |
127 |
128 |
128 install: $(INSTALL_32) |
129 build: $(BUILD_64) |
|
130 |
|
131 install: $(INSTALL_64) |
129 ( cd $(PROTOUSRSHAREDIR)/locale ; \ |
132 ( cd $(PROTOUSRSHAREDIR)/locale ; \ |
130 cp -Rp "en@boldquot" en ; \ |
133 cp -Rp "en@boldquot" en ; \ |
131 cp -Rp "en@boldquot" en_CA ; \ |
134 cp -Rp "en@boldquot" en_CA ; \ |
132 cp -Rp "en@boldquot" en_GB ) |
135 cp -Rp "en@boldquot" en_GB ) |
133 |
136 |
134 test: $(TEST_32) |
137 test: |
|
138 ( cd $(BUILD_DIR_64) ; \ |
|
139 env - $(TEST_PATH) && $(GMAKE) check > $(TEST_OUTPUT) 2>&1 ) |
135 |
140 |
136 BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) |
141 BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) |
137 |
142 |
138 include ../../make-rules/depend.mk |
143 include ../../make-rules/depend.mk |
139 |
144 |