# HG changeset patch # User April Chin # Date 1366827251 25200 # Node ID 16201bef295cd8ffc50a89c87030bd6036434232 # Parent f2d16b3e76db048d55c923ce28dc470002e4b60e 16659836 enable ASLR for cmake, libmemcached, pconsole, pcre, php-5_2, php-5_3, ruby 1.8 16517516 update component Makefiles to explicitly disable ASLR for emacs, gcc 4.5 16716845 pconsole should be 64 bit diff -r f2d16b3e76db -r 16201bef295c components/cmake/Makefile --- a/components/cmake/Makefile Tue Apr 23 02:18:57 2013 -0700 +++ b/components/cmake/Makefile Wed Apr 24 11:14:11 2013 -0700 @@ -19,7 +19,7 @@ # CDDL HEADER END # -# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved. # # parfait seems to hang on libcmsysTestDynload.so.bc, so for @@ -73,6 +73,8 @@ COMPONENT_BUILD_ENV += MAKE="$(GMAKE)" COMPONENT_BUILD_TARGETS = all +ASLR_MODE = $(ASLR_ENABLE) + # Need C and C++ compiler locations for cmake tests COMPONENT_TEST_ENV += CC="$(CC)" COMPONENT_TEST_ENV += CXX="$(CXX)" diff -r f2d16b3e76db -r 16201bef295c components/emacs/Makefile --- a/components/emacs/Makefile Tue Apr 23 02:18:57 2013 -0700 +++ b/components/emacs/Makefile Wed Apr 24 11:14:11 2013 -0700 @@ -82,6 +82,7 @@ # ASLR should remain disabled for emacs (the default); # build consistently core dumps with ASLR +ASLR_MODE = $(ASLR_DISABLE) # variant specific configure options $(BUILD_DIR)/%-nox/.configured: CONFIGURE_OPTIONS += --without-x diff -r f2d16b3e76db -r 16201bef295c components/gcc45/Makefile --- a/components/gcc45/Makefile Tue Apr 23 02:18:57 2013 -0700 +++ b/components/gcc45/Makefile Wed Apr 24 11:14:11 2013 -0700 @@ -80,6 +80,7 @@ CONFIGURE_OPTIONS += CFLAGS="$(CFLAGS)" # Keep ASLR disabled (the default) for gcc 4.5; build often core dumps with ASLR +ASLR_MODE = $(ASLR_DISABLE) COMPONENT_BUILD_ENV += SHELL=$(CONFIG_SHELL) diff -r f2d16b3e76db -r 16201bef295c components/libmemcached/Makefile --- a/components/libmemcached/Makefile Tue Apr 23 02:18:57 2013 -0700 +++ b/components/libmemcached/Makefile Wed Apr 24 11:14:11 2013 -0700 @@ -19,7 +19,7 @@ # CDDL HEADER END # -# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk @@ -69,6 +69,8 @@ # the Makefile sets runpath to a non-existent /usr/lib/libmemcached directory. COMPONENT_BUILD_ARGS += pkglibdir=/usr/lib +ASLR_MODE = $(ASLR_ENABLE) + COMPONENT_INSTALL_ENV += DESTDIR=$(PROTO_DIR) COMPONENT_TEST_TARGETS = test diff -r f2d16b3e76db -r 16201bef295c components/pconsole/Makefile --- a/components/pconsole/Makefile Tue Apr 23 02:18:57 2013 -0700 +++ b/components/pconsole/Makefile Wed Apr 24 11:14:11 2013 -0700 @@ -20,7 +20,7 @@ # # -# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk @@ -44,7 +44,8 @@ ($(CLONEY) $(SOURCE_DIR) $(@D)) # -I argument needed to find the generated config.h file. -CONFIGURE_ENV += "CC=$(CC) -I." +# CC_BITS needed to ensure -m64 is used for 64-bit compile +CONFIGURE_ENV += "CC=$(CC) -I. $(CC_BITS)" # If the configure options are not explicitly set, then configure fails with: # configure: warning: CC=/ws/onnv-tools/SUNWspro/sunstudio12.1/bin/cc: invalid host type @@ -52,13 +53,15 @@ # configure: error: can only configure for one host and one target at a time CONFIGURE_OPTIONS = --prefix=$(CONFIGURE_PREFIX) +ASLR_MODE = $(ASLR_ENABLE) + # DESTDIR doesn't work correctly, so we specify some of the paths directly. COMPONENT_INSTALL_ARGS += prefix=$(PROTOUSRDIR) # common targets -build: $(BUILD_32) +build: $(BUILD_64) -install: $(INSTALL_32) +install: $(INSTALL_64) test: $(NO_TESTS) diff -r f2d16b3e76db -r 16201bef295c components/pcre/Makefile --- a/components/pcre/Makefile Tue Apr 23 02:18:57 2013 -0700 +++ b/components/pcre/Makefile Wed Apr 24 11:14:11 2013 -0700 @@ -19,7 +19,7 @@ # CDDL HEADER END # -# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk @@ -106,6 +106,8 @@ COMPONENT_BUILD_ARGS+= -e +ASLR_MODE = $(ASLR_ENABLE) + COMPONENT_INSTALL_ARGS+= "INSTALL=$(INSTALL)" COMPONENT_INSTALL_ARGS+= "MAKE=$(GMAKE)" diff -r f2d16b3e76db -r 16201bef295c components/php-5_2/common.mk --- a/components/php-5_2/common.mk Tue Apr 23 02:18:57 2013 -0700 +++ b/components/php-5_2/common.mk Wed Apr 24 11:14:11 2013 -0700 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved. # PHP_REL= 5.2 @@ -150,6 +150,8 @@ LD = $(CXX) $(studio_NORUNPATH) LDFLAGS += -L$(MYSQL_LIBDIR) -lrt -L$(IMAP_CLIENT_DIR) +ASLR_MODE = $(ASLR_ENABLE) + CONFIGURE_OPTIONS += CFLAGS="$(CFLAGS)" CONFIGURE_OPTIONS += CPPFLAGS="$(CPPFLAGS)" CONFIGURE_OPTIONS += LD="$(LD)" diff -r f2d16b3e76db -r 16201bef295c components/php-5_3/common.mk --- a/components/php-5_3/common.mk Tue Apr 23 02:18:57 2013 -0700 +++ b/components/php-5_3/common.mk Wed Apr 24 11:14:11 2013 -0700 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved. # PHP_REL= 5.3 @@ -150,6 +150,8 @@ LD = $(CXX) $(studio_NORUNPATH) LDFLAGS += -L$(MYSQL_LIBDIR) -lrt -L$(IMAP_CLIENT_DIR) +ASLR_MODE = $(ASLR_ENABLE) + CONFIGURE_OPTIONS += CFLAGS="$(CFLAGS)" CONFIGURE_OPTIONS += CPPFLAGS="$(CPPFLAGS)" CONFIGURE_OPTIONS += LD="$(LD)" diff -r f2d16b3e76db -r 16201bef295c components/ruby/Makefile --- a/components/ruby/Makefile Tue Apr 23 02:18:57 2013 -0700 +++ b/components/ruby/Makefile Wed Apr 24 11:14:11 2013 -0700 @@ -20,7 +20,7 @@ # # -# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk @@ -119,6 +119,8 @@ # unreferenced symbol tgetent in libreadline, similar to CR #6919344 LD_Z_IGNORE= +ASLR_MODE = $(ASLR_ENABLE) + CONFIGURE_PREFIX = $(USRDIR)/$(COMPONENT_NAME)/$(RUBY_VER) CONFIGURE_OPTIONS += $(DTRACE_FLAG) CONFIGURE_OPTIONS += --enable-shared