16602454 more things have been decreed to be 64-bit/aslr'd
authorMike Sullivan <Mike.Sullivan@Oracle.COM>
Wed, 10 Apr 2013 10:16:27 -0700
changeset 1256 afd0cd885ab3
parent 1255 b7b09f9348b7
child 1257 167a42b7a742
16602454 more things have been decreed to be 64-bit/aslr'd
components/bison/Makefile
components/bison/bison.p5m
components/bzip2/bzip2.p5m
components/less/Makefile
components/make/Makefile
components/ncftp/Makefile
components/patch/Makefile
components/tcsh/Makefile
components/tcsh/patches/004.amd64.patch
components/tcsh/tcsh.p5m
--- a/components/bison/Makefile	Tue Apr 09 22:03:20 2013 -0700
+++ b/components/bison/Makefile	Wed Apr 10 10:16:27 2013 -0700
@@ -55,7 +55,7 @@
 
 install:	$(INSTALL_32_and_64)
 
-test:		$(TEST_32)
+test:		$(TEST_64)
 
 BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
 
--- a/components/bison/bison.p5m	Tue Apr 09 22:03:20 2013 -0700
+++ b/components/bison/bison.p5m	Wed Apr 10 10:16:27 2013 -0700
@@ -38,7 +38,7 @@
 set name=org.opensolaris.arc-caseid \
     value=PSARC/2007/289
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-file path=usr/bin/bison
+file usr/bin/$(MACH64)/bison path=usr/bin/bison
 file path=usr/share/aclocal/bison-i18n.m4
 file path=usr/share/bison/README
 file path=usr/share/bison/c++.m4
--- a/components/bzip2/bzip2.p5m	Tue Apr 09 22:03:20 2013 -0700
+++ b/components/bzip2/bzip2.p5m	Wed Apr 10 10:16:27 2013 -0700
@@ -39,12 +39,12 @@
 set name=org.opensolaris.arc-caseid \
     value=PSARC/1999/555
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-file path=usr/bin/bunzip2
-file path=usr/bin/bzcat
+file build/$(MACH64)/bzip2 path=usr/bin/bunzip2
+file build/$(MACH64)/bzip2 path=usr/bin/bzcat
 file path=usr/bin/bzdiff
 file path=usr/bin/bzgrep
-file path=usr/bin/bzip2
-file path=usr/bin/bzip2recover
+file build/$(MACH64)/bzip2 path=usr/bin/bzip2
+file build/$(MACH64)/bzip2recover path=usr/bin/bzip2recover
 file path=usr/bin/bzmore
 file path=usr/include/bzlib.h
 file path=usr/lib/$(MACH64)/libbz2.so.1
--- a/components/less/Makefile	Tue Apr 09 22:03:20 2013 -0700
+++ b/components/less/Makefile	Wed Apr 10 10:16:27 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
@@ -39,12 +39,18 @@
 include ../../make-rules/configure.mk
 include ../../make-rules/ips.mk
 
+CC += $(CC_BITS)
+
+CONFIGURE_BINDIR.64 =   $(CONFIGURE_PREFIX)/bin
+
 CONFIGURE_OPTIONS  +=		CFLAGS="$(CFLAGS)"
 
+ASLR_MODE = $(ASLR_ENABLE)
+
 # common targets
-build:		$(BUILD_32)
+build:		$(BUILD_64)
 
-install:	$(INSTALL_32)
+install:	$(INSTALL_64)
 
 test:		$(NO_TESTS)
 
--- a/components/make/Makefile	Tue Apr 09 22:03:20 2013 -0700
+++ b/components/make/Makefile	Wed Apr 10 10:16:27 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
@@ -39,17 +39,20 @@
 include ../../make-rules/configure.mk
 include ../../make-rules/ips.mk
 
+CONFIGURE_BINDIR.64 =   $(CONFIGURE_PREFIX)/bin
+
 CONFIGURE_OPTIONS  +=		--program-prefix=g
 CONFIGURE_OPTIONS  +=		--infodir=$(CONFIGURE_INFODIR)
 CONFIGURE_OPTIONS  +=		CFLAGS="$(CFLAGS)"
 
+ASLR_MODE = $(ASLR_ENABLE)
 
 # common targets
-build:		$(BUILD_32)
+build:		$(BUILD_64)
 
-install:	$(INSTALL_32)
+install:	$(INSTALL_64)
 
-test:		$(TEST_32)
+test:		$(TEST_64)
 
 BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
 
--- a/components/ncftp/Makefile	Tue Apr 09 22:03:20 2013 -0700
+++ b/components/ncftp/Makefile	Wed Apr 10 10:16:27 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
@@ -48,14 +48,16 @@
 CONFIGURE_ENV += CFLAGS="$(CFLAGS)"
 
 CONFIGURE_OPTIONS = --prefix=$(CONFIGURE_PREFIX)
-CONFIGURE_OPTIONS += --srcdir=$(BUILD_DIR_32) 
+CONFIGURE_OPTIONS += --srcdir=$(BUILD_DIR_64) 
+
+ASLR_MODE = $(ASLR_ENABLE)
 
 include ../../make-rules/shared-targets.mk
 
 # common targets
-build:		$(BUILD_32)
+build:		$(BUILD_64)
 
-install:	$(INSTALL_32)
+install:	$(INSTALL_64)
 
 BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
 
--- a/components/patch/Makefile	Tue Apr 09 22:03:20 2013 -0700
+++ b/components/patch/Makefile	Wed Apr 10 10:16:27 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.
 #
 
 include ../../make-rules/shared-macros.mk
@@ -39,10 +39,12 @@
 
 CONFIGURE_OPTIONS  +=		CFLAGS="$(CFLAGS)"
 
+ASLR_MODE = $(ASLR_ENABLE)
+
 # common targets
-build:		$(BUILD_32)
+build:		$(BUILD_64)
 
-install:	$(INSTALL_32)
+install:	$(INSTALL_64)
 
 test:		$(NO_TESTS)
 
--- a/components/tcsh/Makefile	Tue Apr 09 22:03:20 2013 -0700
+++ b/components/tcsh/Makefile	Wed Apr 10 10:16:27 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
@@ -48,13 +48,17 @@
 
 LOCALEDIR=$(PROTO_DIR)/$(CONFIGURE_LOCALEDIR)
 
+CONFIGURE_BINDIR.64 =   $(CONFIGURE_PREFIX)/bin
+
 CONFIGURE_OPTIONS  +=		--localedir=$(CONFIGURE_LOCALEDIR)
 CONFIGURE_OPTIONS  +=		CFLAGS="$(CFLAGS)"
 
+ASLR_MODE = $(ASLR_ENABLE)
+
 # common targets
-build:		$(BUILD_32)
+build:		$(BUILD_64)
 
-install:	$(INSTALL_32)
+install:	$(INSTALL_64)
 
 BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/tcsh/patches/004.amd64.patch	Wed Apr 10 10:16:27 2013 -0700
@@ -0,0 +1,26 @@
+--- tcsh-6.18.01/host.defs.orig	Mon Mar  4 10:31:07 2013
++++ tcsh-6.18.01/host.defs	Mon Mar  4 10:42:45 2013
[email protected]@ -41,6 +41,7 @@
+ macro	: M_mips64eb : (defined(mips64) || defined(__mips64)) && (defined(MIPSEB) || defined(__MIPSEB))
+ macro	: M_mipsel : (!defined(M_mips64el)) && (defined(mips) || defined(__mips)) && (defined(MIPSEL) || defined(__MIPSEL))
+ macro	: M_mipseb : (!defined(M_mips64eb)) && (defined(mips) || defined(__mips)) && (defined(MIPSEB) || defined(__MIPSEB))
++macro	: M_amd64 : (defined(__amd64))
+ macro	: M_i386 : (defined(i386) || defined(__i386__))
+ macro	: M_i486 : (defined(i486) || defined(__i486__))
+ macro	: M_i586 : (defined(i586) || defined(__i586__))
[email protected]@ -333,6 +334,7 @@
+ vendor	:						: "sun"
+ hosttype: defined(M_i386) && !defined(__SVR4)		: "sun386i"
+ hosttype: defined(M_i386) && defined(__SVR4)		: "i86pc"
++hosttype: defined(M_amd64) 				: "i86pc"
+ hosttype: defined(mc68010)				: "sun2"
+ hosttype: defined(mc68020)				: "sun3"
+ hosttype: defined(sparc)				: "sun4"
[email protected]@ -345,6 +347,7 @@
+ machtype: defined(sparcv9)				: "sparcv9"
+ machtype: defined(sparc)				: "sparc"
+ machtype: defined(M_i386)				: "i386"
++machtype: defined(M_amd64)				: "amd64"
+ enddef	:
+ 
+ 
--- a/components/tcsh/tcsh.p5m	Tue Apr 09 22:03:20 2013 -0700
+++ b/components/tcsh/tcsh.p5m	Wed Apr 10 10:16:27 2013 -0700
@@ -36,17 +36,17 @@
     value=PSARC/2007/025
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 file path=usr/bin/tcsh
-file $(MACH32)/nls/german.cat path=usr/share/locale/de/LC_MESSAGES/tcsh.cat
-file $(MACH32)/nls/greek.cat path=usr/share/locale/el/LC_MESSAGES/tcsh.cat
-file $(MACH32)/nls/spanish.cat path=usr/share/locale/es/LC_MESSAGES/tcsh.cat
-file $(MACH32)/nls/et.cat path=usr/share/locale/et/LC_MESSAGES/tcsh.cat
-file $(MACH32)/nls/finnish.cat path=usr/share/locale/fi/LC_MESSAGES/tcsh.cat
-file $(MACH32)/nls/french.cat path=usr/share/locale/fr/LC_MESSAGES/tcsh.cat
-file $(MACH32)/nls/italian.cat path=usr/share/locale/it/LC_MESSAGES/tcsh.cat
-file $(MACH32)/nls/ja.cat path=usr/share/locale/ja/LC_MESSAGES/tcsh.cat
-file $(MACH32)/nls/pl.cat path=usr/share/locale/pl/LC_MESSAGES/tcsh.cat
-file $(MACH32)/nls/russian.cat path=usr/share/locale/ru/LC_MESSAGES/tcsh.cat
-file $(MACH32)/nls/ukrainian.cat path=usr/share/locale/uk/LC_MESSAGES/tcsh.cat
+file $(MACH64)/nls/german.cat path=usr/share/locale/de/LC_MESSAGES/tcsh.cat
+file $(MACH64)/nls/greek.cat path=usr/share/locale/el/LC_MESSAGES/tcsh.cat
+file $(MACH64)/nls/spanish.cat path=usr/share/locale/es/LC_MESSAGES/tcsh.cat
+file $(MACH64)/nls/et.cat path=usr/share/locale/et/LC_MESSAGES/tcsh.cat
+file $(MACH64)/nls/finnish.cat path=usr/share/locale/fi/LC_MESSAGES/tcsh.cat
+file $(MACH64)/nls/french.cat path=usr/share/locale/fr/LC_MESSAGES/tcsh.cat
+file $(MACH64)/nls/italian.cat path=usr/share/locale/it/LC_MESSAGES/tcsh.cat
+file $(MACH64)/nls/ja.cat path=usr/share/locale/ja/LC_MESSAGES/tcsh.cat
+file $(MACH64)/nls/pl.cat path=usr/share/locale/pl/LC_MESSAGES/tcsh.cat
+file $(MACH64)/nls/russian.cat path=usr/share/locale/ru/LC_MESSAGES/tcsh.cat
+file $(MACH64)/nls/ukrainian.cat path=usr/share/locale/uk/LC_MESSAGES/tcsh.cat
 file manpages/tcsh.1 path=usr/share/man/man1/tcsh.1
 legacy pkg=SUNWtcsh \
     desc="Tenex C-shell (tcsh)" \