18423046 Enable aslr in slang
authormahmood.ali@oracle.com <mahmood.ali@oracle.com>
Wed, 19 Mar 2014 16:24:36 -0700
changeset 1772 6f53e94c4c78
parent 1771 69e31ffe55e7
child 1773 1462914de989
18423046 Enable aslr in slang 18423104 Enable 64 bit in Iperf
components/iperf/Makefile
components/iperf/iperf.p5m
components/slang/Makefile
--- a/components/iperf/Makefile	Wed Mar 19 13:06:31 2014 -0700
+++ b/components/iperf/Makefile	Wed Mar 19 16:24:36 2014 -0700
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
 #
 
 include ../../make-rules/shared-macros.mk
@@ -51,13 +51,12 @@
 COMPONENT_BUILD_ARGS  +=	AM_CXXFLAGS=""
 COMPONENT_BUILD_ARGS  +=	AM_CFLAGS=""
 
-# Enable ASLR for this component
 ASLR_MODE = $(ASLR_ENABLE)
 
 # common targets
-build:		$(BUILD_32)
+build:		$(BUILD_64)
 
-install:	$(INSTALL_32)
+install:	$(INSTALL_64)
 
 test:		$(NO_TESTS)
 
--- a/components/iperf/iperf.p5m	Wed Mar 19 13:06:31 2014 -0700
+++ b/components/iperf/iperf.p5m	Wed Mar 19 16:24:36 2014 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -36,5 +36,5 @@
 
 license iperf.license license='BSD-like'
 
-file path=usr/bin/iperf
+file usr/bin/$(MACH64)/iperf path=usr/bin/iperf
 file path=usr/share/man/man1/iperf.1
--- a/components/slang/Makefile	Wed Mar 19 13:06:31 2014 -0700
+++ b/components/slang/Makefile	Wed Mar 19 16:24:36 2014 -0700
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
 #
 
 include ../../make-rules/shared-macros.mk
@@ -46,6 +46,8 @@
 CONFIGURE_OPTIONS  +=		LDFLAGS="$(CFLAGS)"
 CONFIGURE_OPTIONS  +=		--sysconfdir=$(ETCDIR)/slsh
 
+ASLR_MODE = $(ASLR_ENABLE)
+
 # common targets
 build:		$(BUILD_32_and_64)