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, 2015, Oracle and/or its affiliates. All rights reserved. |
21 # Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved. |
22 # |
22 # |
23 |
23 |
24 # As Solaris always has a 64-bit kernel, and 64-bit emacs can handle larger |
24 # As Solaris always has a 64-bit kernel, and 64-bit emacs can handle larger |
25 # files, we only build and deliver 64-bit binaries. |
25 # files, we only build and deliver 64-bit binaries. |
26 BITS=64 |
26 BITS=64 |
107 |
107 |
108 # ASLR should remain disabled for emacs. ASLR undermines emacs's dumping |
108 # ASLR should remain disabled for emacs. ASLR undermines emacs's dumping |
109 # code, which requires every execution to have the same mappings. Since |
109 # code, which requires every execution to have the same mappings. Since |
110 # emacs is not network facing, or run with elevated privileges, this is |
110 # emacs is not network facing, or run with elevated privileges, this is |
111 # not a security concern. |
111 # not a security concern. |
112 ASLR_MODE = $(ASLR_DISABLE) |
112 # |
|
113 # As with ASLR, ADIHEAP should be explicitly disabled for emacs, as the |
|
114 # dumped emacs cannot work with ADI. Recognizing that ASLR_MODE could really |
|
115 # be SX_MODE, and generalized to handle all the sxadm extensions, redefine |
|
116 # it here to handle both cases. It is expected that in due course, the |
|
117 # Userland framework will evolve in this direction. |
|
118 # |
|
119 ifeq ($(OS_VERSION), 5.11) |
|
120 ASLR_MODE = $(ASLR_DISABLE) |
|
121 else |
|
122 ASLR_MODE = -z sx=aslr=disable,adiheap=disable |
|
123 endif |
113 |
124 |
114 # variant specific configure options |
125 # variant specific configure options |
115 $(BUILD_DIR)/%-nox/.configured: CONFIGURE_OPTIONS += --without-all --without-x |
126 $(BUILD_DIR)/%-nox/.configured: CONFIGURE_OPTIONS += --without-all --without-x |
116 $(BUILD_DIR)/%-x/.configured: CONFIGURE_OPTIONS += --with-x-toolkit=lucid |
127 $(BUILD_DIR)/%-x/.configured: CONFIGURE_OPTIONS += --with-x-toolkit=lucid |
117 $(BUILD_DIR)/%-gtk/.configured: CONFIGURE_OPTIONS += --with-x-toolkit=gtk |
128 $(BUILD_DIR)/%-gtk/.configured: CONFIGURE_OPTIONS += --with-x-toolkit=gtk |