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.
17476375 argparse, convmv, meld, parallel and quilt should be "64-bit"
authorRich Burridge <rich.burridge@oracle.com>
Thu, 19 Sep 2013 10:19:20 -0700
changeset 1480 1d8d2e9374cc
parent 1479 00fd84194115
child 1481 246d38ae4b93
17476375 argparse, convmv, meld, parallel and quilt should be "64-bit"
components/convmv/Makefile file | annotate | diff | comparison | revisions
components/meld/Makefile file | annotate | diff | comparison | revisions
components/parallel/Makefile file | annotate | diff | comparison | revisions
components/parallel/parallel.p5m file | annotate | diff | comparison | revisions
components/python/argparse/Makefile file | annotate | diff | comparison | revisions
components/quilt/Makefile file | annotate | diff | comparison | revisions
components/quilt/quilt.p5m file | annotate | diff | comparison | revisions 
--- a/components/convmv/Makefile	Thu Sep 19 10:15:45 2013 -0700
+++ b/components/convmv/Makefile	Thu Sep 19 10:19:20 2013 -0700
@@ -46,11 +46,11 @@
 ASLR_MODE = $(ASLR_NOT_APPLICABLE)
 
 # 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/meld/Makefile	Thu Sep 19 10:15:45 2013 -0700
+++ b/components/meld/Makefile	Thu Sep 19 10:19:20 2013 -0700
@@ -44,9 +44,9 @@
 ASLR_MODE = $(ASLR_NOT_APPLICABLE)
 
 # common targets
-build:		$(BUILD_32)
+build:		$(BUILD_64)
 
-install:	$(INSTALL_32)
+install:	$(INSTALL_64)
 
 test:		$(NO_TESTS)
 
--- a/components/parallel/Makefile	Thu Sep 19 10:15:45 2013 -0700
+++ b/components/parallel/Makefile	Thu Sep 19 10:19:20 2013 -0700
@@ -49,9 +49,9 @@
 ASLR_MODE = $(ASLR_NOT_APPLICABLE)
 
 # common targets
-build:		$(BUILD_32)
+build:		$(BUILD_64)
 
-install:	$(INSTALL_32)
+install:	$(INSTALL_64)
 
 test:		$(NO_TESTS)
 
--- a/components/parallel/parallel.p5m	Thu Sep 19 10:15:45 2013 -0700
+++ b/components/parallel/parallel.p5m	Thu Sep 19 10:19:20 2013 -0700
@@ -34,10 +34,10 @@
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid value=PSARC/2012/182
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-file path=usr/bin/niceload
-file path=usr/bin/parallel
-file path=usr/bin/sem
-file path=usr/bin/sql
+file usr/bin/$(MACH64)/niceload path=usr/bin/niceload
+file usr/bin/$(MACH64)/parallel path=usr/bin/parallel
+file usr/bin/$(MACH64)/sem path=usr/bin/sem
+file usr/bin/$(MACH64)/sql path=usr/bin/sql
 file path=usr/share/doc/parallel/niceload.html
 file path=usr/share/doc/parallel/niceload.texi
 file path=usr/share/doc/parallel/parallel.html
--- a/components/python/argparse/Makefile	Thu Sep 19 10:15:45 2013 -0700
+++ b/components/python/argparse/Makefile	Thu Sep 19 10:19:20 2013 -0700
@@ -43,9 +43,9 @@
 ASLR_MODE = $(ASLR_NOT_APPLICABLE)
 
 # common targets
-build:		$(BUILD_32)
+build:		$(BUILD_NO_ARCH)
 
-install:	$(INSTALL_32)
+install:	$(INSTALL_NO_ARCH)
 
 test:		$(NO_TESTS)
 
--- a/components/quilt/Makefile	Thu Sep 19 10:15:45 2013 -0700
+++ b/components/quilt/Makefile	Thu Sep 19 10:19:20 2013 -0700
@@ -77,11 +77,11 @@
 ASLR_MODE = $(ASLR_NOT_APPLICABLE)
 
 # 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/quilt/quilt.p5m	Thu Sep 19 10:15:45 2013 -0700
+++ b/components/quilt/quilt.p5m	Thu Sep 19 10:19:20 2013 -0700
@@ -41,8 +41,8 @@
 file path=etc/quilt.quiltrc \
     overlay=allow preserve=true original_name=SUNWquilt:etc/quilt.quiltrc \
     mode=0644
-file path=usr/bin/guards
-file path=usr/bin/quilt
+file usr/bin/$(MACH64)/guards path=usr/bin/guards
+file usr/bin/$(MACH64)/quilt path=usr/bin/quilt
 file usr/share/doc/quilt/README \
     path=usr/share/doc/quilt-$(COMPONENT_VERSION)/README
 file usr/share/doc/quilt/README.MAIL \
upstream/oracle/userland-gate