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.
16578949 GNU diffutils should be 64-bit
authorRich Burridge <rich.burridge@oracle.com>
Thu, 13 Jun 2013 06:49:48 -0700
changeset 1342 1b53e0a91d50
parent 1341 af3d6ef22d65
child 1343 a66d36656846
16578949 GNU diffutils should be 64-bit
components/diffutils/Makefile file | annotate | diff | comparison | revisions
components/diffutils/diffutils.p5m file | annotate | diff | comparison | revisions
components/diffutils/resolve.deps file | annotate | diff | comparison | revisions 
--- a/components/diffutils/Makefile	Tue Jun 11 12:58:54 2013 -0700
+++ b/components/diffutils/Makefile	Thu Jun 13 06:49:48 2013 -0700
@@ -39,7 +39,10 @@
 include ../../make-rules/configure.mk
 include ../../make-rules/ips.mk
 
-CONFIGURE_BINDIR.32 =		$(CONFIGURE_PREFIX)/gnu/bin
+# Need to reduce optimization level in order to successfully run the
+# configure test for detecting whether Solaris can detect stack overflow.
+# See CR #16954300.
+studio_OPT = -xO3
 
 CONFIGURE_OPTIONS  +=		--infodir=$(CONFIGURE_INFODIR)
 CONFIGURE_OPTIONS  +=		CFLAGS="$(CFLAGS)"
@@ -47,11 +50,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/diffutils/diffutils.p5m	Tue Jun 11 12:58:54 2013 -0700
+++ b/components/diffutils/diffutils.p5m	Thu Jun 13 06:49:48 2013 -0700
@@ -37,10 +37,10 @@
 set name=org.opensolaris.arc-caseid \
     value=PSARC/2007/189
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-file path=usr/gnu/bin/cmp
-file path=usr/gnu/bin/diff
-file path=usr/gnu/bin/diff3
-file path=usr/gnu/bin/sdiff
+file usr/bin/$(MACH64)/cmp path=usr/gnu/bin/cmp
+file usr/bin/$(MACH64)/diff path=usr/gnu/bin/diff
+file usr/bin/$(MACH64)/diff3 path=usr/gnu/bin/diff3
+file usr/bin/$(MACH64)/sdiff path=usr/gnu/bin/sdiff
 file path=usr/share/info/diffutils.info
 file path=usr/share/locale/ca/LC_MESSAGES/diffutils.mo
 file path=usr/share/locale/cs/LC_MESSAGES/diffutils.mo
--- a/components/diffutils/resolve.deps	Tue Jun 11 12:58:54 2013 -0700
+++ b/components/diffutils/resolve.deps	Thu Jun 13 06:49:48 2013 -0700
@@ -1,2 +1,1 @@
 system/library
-library/libsigsegv
upstream/oracle/userland-gate