Mercurial Mercurial > upstream > oracle > userland-gate / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
16522201 Various Userland components should be 64-bit
authorRich Burridge <rich.burridge@oracle.com>
Thu, 28 Mar 2013 07:41:58 -0700
changeset 1232 e550ed2e3065
parent 1231 44cd216060fd
child 1233 4817abd9e86b
16522201 Various Userland components should be 64-bit
components/clisp/Makefile file | annotate | diff | comparison | revisions
components/conflict/Makefile file | annotate | diff | comparison | revisions
components/elinks/Makefile file | annotate | diff | comparison | revisions
components/elinks/elinks.p5m file | annotate | diff | comparison | revisions
components/fping/Makefile file | annotate | diff | comparison | revisions
components/fping/fping.p5m file | annotate | diff | comparison | revisions
components/hexedit/Makefile file | annotate | diff | comparison | revisions
components/hexedit/hexedit.p5m file | annotate | diff | comparison | revisions
components/links/Makefile file | annotate | diff | comparison | revisions
components/links/links.p5m file | annotate | diff | comparison | revisions
components/pv/Makefile file | annotate | diff | comparison | revisions
components/pv/pv.p5m file | annotate | diff | comparison | revisions 
--- a/components/clisp/Makefile	Wed Mar 27 17:00:27 2013 -0600
+++ b/components/clisp/Makefile	Thu Mar 28 07:41:58 2013 -0700
@@ -66,6 +66,7 @@
 CONFIGURE_OPTIONS += --with-libreadline-prefix=$(CONFIGURE_PREFIX)
 
 # For now keep ASLR disabled for clisp (the default); build may core dump with ASLR
+ASLR_MODE = $(ASLR_DISABLE)
 
 # Prevent clisp.ps and clisp.pdf having different versions for SPARC
 # and x86 in the clisp package, because of embedded dates.
--- a/components/conflict/Makefile	Wed Mar 27 17:00:27 2013 -0600
+++ b/components/conflict/Makefile	Thu Mar 28 07:41:58 2013 -0700
@@ -44,6 +44,8 @@
 COMPONENT_PRE_CONFIGURE_ACTION = \
 	($(CLONEY) $(SOURCE_DIR) $(@D))
 
+CC +=	$(CC_BITS)
+
 CONFIGURE_ENV += "CC=$(CC)"
 
 # If the configure options are not explicitly set, then configure fails with:
@@ -56,12 +58,12 @@
 ASLR_MODE = $(ASLR_ENABLE)
 
 # common targets
-build:		$(BUILD_32)
+build:		$(BUILD_64)
 
-install:	$(INSTALL_32)
+install:	$(INSTALL_64)
 
 test:		build
-	@cd $(BUILD_DIR_32); ./run_test.sh
+	@cd $(BUILD_DIR_64); ./run_test.sh
 
 BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
 
--- a/components/elinks/Makefile	Wed Mar 27 17:00:27 2013 -0600
+++ b/components/elinks/Makefile	Thu Mar 28 07:41:58 2013 -0700
@@ -44,11 +44,11 @@
 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/elinks/elinks.p5m	Wed Mar 27 17:00:27 2013 -0600
+++ b/components/elinks/elinks.p5m	Thu Mar 28 07:41:58 2013 -0700
@@ -104,7 +104,7 @@
 dir path=usr/share/man
 dir path=usr/share/man/man1
 dir path=usr/share/man/man5
-file path=usr/bin/elinks
+file usr/bin/$(MACH64)/elinks path=usr/bin/elinks
 file path=usr/share/doc/elinks/bittorrent.txt
 file path=usr/share/doc/elinks/bookmarks.txt
 file path=usr/share/doc/elinks/color-model.txt
--- a/components/fping/Makefile	Wed Mar 27 17:00:27 2013 -0600
+++ b/components/fping/Makefile	Thu Mar 28 07:41:58 2013 -0700
@@ -48,9 +48,9 @@
 ASLR_MODE = $(ASLR_ENABLE)
 
 # common targets
-build:		$(BUILD_32)
+build:		$(BUILD_64)
 
-install:	$(INSTALL_32)
+install:	$(INSTALL_64)
 
 test:		$(NO_TESTS)
 
--- a/components/fping/fping.p5m	Wed Mar 27 17:00:27 2013 -0600
+++ b/components/fping/fping.p5m	Thu Mar 28 07:41:58 2013 -0700
@@ -46,7 +46,7 @@
 dir path=usr/share/man
 dir path=usr/share/man/man1m
 file exec_attr path=etc/security/exec_attr.d/fping
-file usr/sbin/fping path=usr/bin/fping
+file usr/sbin/$(MACH64)/fping path=usr/bin/fping
 file fping.1m path=usr/share/man/man1m/fping.1m
 
 license fping.license license=MIT
--- a/components/hexedit/Makefile	Wed Mar 27 17:00:27 2013 -0600
+++ b/components/hexedit/Makefile	Thu Mar 28 07:41:58 2013 -0700
@@ -45,13 +45,14 @@
 CFLAGS += "-Dinline"
 
 CONFIGURE_OPTIONS  +=		CFLAGS="$(CFLAGS)"
+CONFIGURE_OPTIONS  +=		LDFLAGS="$(LDFLAGS) $(CC_BITS)"
 
 ASLR_MODE = $(ASLR_ENABLE)
 
 # common targets
-build:		$(BUILD_32)
+build:		$(BUILD_64)
 
-install:	$(INSTALL_32)
+install:	$(INSTALL_64)
 
 test:		$(NO_TESTS)
 
--- a/components/hexedit/hexedit.p5m	Wed Mar 27 17:00:27 2013 -0600
+++ b/components/hexedit/hexedit.p5m	Thu Mar 28 07:41:58 2013 -0700
@@ -43,7 +43,7 @@
 dir path=usr/share
 dir path=usr/share/man
 dir path=usr/share/man/man1
-file path=usr/bin/hexedit
+file usr/bin/$(MACH64)/hexedit path=usr/bin/hexedit
 file path=usr/share/man/man1/hexedit.1
 
 license hexedit.license license=GPLv2
--- a/components/links/Makefile	Wed Mar 27 17:00:27 2013 -0600
+++ b/components/links/Makefile	Thu Mar 28 07:41:58 2013 -0700
@@ -46,9 +46,9 @@
 ASLR_MODE = $(ASLR_ENABLE)
 
 # common targets
-build:		$(BUILD_32)
+build:		$(BUILD_64)
 
-install:	$(INSTALL_32)
+install:	$(INSTALL_64)
 
 test:	$(NO_TESTS)
 
--- a/components/links/links.p5m	Wed Mar 27 17:00:27 2013 -0600
+++ b/components/links/links.p5m	Thu Mar 28 07:41:58 2013 -0700
@@ -41,5 +41,5 @@
 dir path=usr/share
 dir path=usr/share/man
 dir path=usr/share/man/man1
-file path=usr/bin/links
+file usr/bin/$(MACH64)/links path=usr/bin/links
 file path=usr/share/man/man1/links.1
--- a/components/pv/Makefile	Wed Mar 27 17:00:27 2013 -0600
+++ b/components/pv/Makefile	Thu Mar 28 07:41:58 2013 -0700
@@ -44,7 +44,7 @@
 
 PATCH_LEVEL=	0
 
-PKG_PROTO_DIRS += $(BUILD_DIR_32)
+PKG_PROTO_DIRS += $(BUILD_DIR_64)
 
 CONFIGURE_OPTIONS  +=	CFLAGS="$(CFLAGS)"
 
@@ -53,11 +53,11 @@
 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/pv/pv.p5m	Wed Mar 27 17:00:27 2013 -0600
+++ b/components/pv/pv.p5m	Thu Mar 28 07:41:58 2013 -0700
@@ -49,7 +49,7 @@
 dir path=usr/share/locale/pt/LC_MESSAGES
 dir path=usr/share/man
 dir path=usr/share/man/man1
-file path=usr/bin/pv
+file usr/bin/$(MACH64)/pv path=usr/bin/pv
 file path=usr/share/locale/de/LC_MESSAGES/pv.mo
 file path=usr/share/locale/fr/LC_MESSAGES/pv.mo
 file path=usr/share/locale/pl/LC_MESSAGES/pv.mo
upstream/oracle/userland-gate