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.
fix SPRO_ROOT usage to match ON and SFW and not be confusing
authorNorm Jacobs <Norm.Jacobs@Sun.COM>
Tue, 19 Oct 2010 15:39:47 -0500
changeset 40 84267c1130e9
parent 39 c007f5bce2f6
child 41 50cc241a2b9a
fix SPRO_ROOT usage to match ON and SFW and not be confusing
components/bind/Makefile file | annotate | diff | comparison | revisions
components/bind/bind.p5m file | annotate | diff | comparison | revisions
components/file/Makefile file | annotate | diff | comparison | revisions
components/lcms/Makefile file | annotate | diff | comparison | revisions
components/libmng/Makefile file | annotate | diff | comparison | revisions
components/pycups/Makefile file | annotate | diff | comparison | revisions
components/rsync/Makefile file | annotate | diff | comparison | revisions
make-rules/shared-macros.mk file | annotate | diff | comparison | revisions 
--- a/components/bind/Makefile	Fri Oct 15 16:16:53 2010 -0500
+++ b/components/bind/Makefile	Tue Oct 19 15:39:47 2010 -0500
@@ -117,8 +117,8 @@
 REQUIRED_TOOL +=	/usr/gnu/bin/as
 REQUIRED_TOOL +=	/usr/gnu/bin/echo
 REQUIRED_TOOL +=	/usr/gnu/bin/etags
-REQUIRED_TOOL +=	$(SPRO_ROOT)/bin/cc
-REQUIRED_TOOL +=	$(SPRO_ROOT)/bin/CC
+REQUIRED_TOOL +=	$(SPRO_VROOT)/bin/cc
+REQUIRED_TOOL +=	$(SPRO_VROOT)/bin/CC
 
 REQUIRED_FILE +=	/lib/$(MACH64)/libc.so
 REQUIRED_FILE +=	/lib/$(MACH64)/libcrypto.so
--- a/components/bind/bind.p5m	Fri Oct 15 16:16:53 2010 -0500
+++ b/components/bind/bind.p5m	Tue Oct 19 15:39:47 2010 -0500
@@ -491,6 +491,7 @@
 link path=usr/lib/liblwres.so.60 target=liblwres.so.60.0.0
 link path=usr/sbin/named-compilezone target=named-checkzone
 link path=usr/share/man/man8/named-compilezone.8 target=named-checkzone.8
+depend fmri=pkg:/SUNWcs type=require
 depend fmri=pkg:/library/libxml2 type=require
 depend fmri=pkg:/library/security/openssl type=require
 depend fmri=pkg:/library/zlib type=require
--- a/components/file/Makefile	Fri Oct 15 16:16:53 2010 -0500
+++ b/components/file/Makefile	Tue Oct 19 15:39:47 2010 -0500
@@ -94,8 +94,8 @@
 REQUIRED_TOOL +=	/usr/gnu/bin/echo
 REQUIRED_TOOL +=	/usr/gnu/bin/m4
 REQUIRED_TOOL +=	/usr/gnu/bin/mkdir
-REQUIRED_TOOL +=	$(SPRO_ROOT)/bin/cc
-REQUIRED_TOOL +=	$(SPRO_ROOT)/bin/CC
+REQUIRED_TOOL +=	$(SPRO_VROOT)/bin/cc
+REQUIRED_TOOL +=	$(SPRO_VROOT)/bin/CC
 
 REQUIRED_FILE +=	/lib/$(MACH64)/libc.so
 REQUIRED_FILE +=	/lib/$(MACH64)/libm.so
--- a/components/lcms/Makefile	Fri Oct 15 16:16:53 2010 -0500
+++ b/components/lcms/Makefile	Tue Oct 19 15:39:47 2010 -0500
@@ -92,8 +92,8 @@
 REQUIRED_TOOL +=	/usr/gnu/bin/as
 REQUIRED_TOOL +=	/usr/gnu/bin/echo
 REQUIRED_TOOL +=	/usr/gnu/bin/mkdir
-REQUIRED_TOOL +=	$(SPRO_ROOT)/bin/cc
-REQUIRED_TOOL +=	$(SPRO_ROOT)/bin/CC
+REQUIRED_TOOL +=	$(SPRO_VROOT)/bin/cc
+REQUIRED_TOOL +=	$(SPRO_VROOT)/bin/CC
 
 REQUIRED_FILE +=	/lib/$(MACH64)/libc.so
 REQUIRED_FILE +=	/lib/$(MACH64)/libm.so
--- a/components/libmng/Makefile	Fri Oct 15 16:16:53 2010 -0500
+++ b/components/libmng/Makefile	Tue Oct 19 15:39:47 2010 -0500
@@ -127,8 +127,8 @@
 REQUIRED_TOOL +=	/usr/gnu/bin/mkdir
 REQUIRED_TOOL +=	/usr/gnu/bin/sort
 REQUIRED_TOOL +=	/usr/gnu/bin/uname
-REQUIRED_TOOL +=	$(SPRO_ROOT)/bin/cc
-REQUIRED_TOOL +=	$(SPRO_ROOT)/bin/CC
+REQUIRED_TOOL +=	$(SPRO_VROOT)/bin/cc
+REQUIRED_TOOL +=	$(SPRO_VROOT)/bin/CC
 
 REQUIRED_FILE +=	/usr/include/jpeglib.h
 REQUIRED_FILE +=	/usr/include/lcms/lcms.h
--- a/components/pycups/Makefile	Fri Oct 15 16:16:53 2010 -0500
+++ b/components/pycups/Makefile	Tue Oct 19 15:39:47 2010 -0500
@@ -64,7 +64,7 @@
 REQUIRED_TOOL +=	/usr/bin/touch
 REQUIRED_TOOL +=	/usr/lib/python2.4/pycc
 REQUIRED_TOOL +=	/usr/lib/python2.6/pycc
-REQUIRED_TOOL +=	$(SPRO_ROOT)/bin/cc
+REQUIRED_TOOL +=	$(SPRO_VROOT)/bin/cc
 
 REQUIRED_FILE +=	/lib/libc.so
 REQUIRED_FILE +=	/usr/include/ctype.h
--- a/components/rsync/Makefile	Fri Oct 15 16:16:53 2010 -0500
+++ b/components/rsync/Makefile	Tue Oct 19 15:39:47 2010 -0500
@@ -80,7 +80,7 @@
 REQUIRED_TOOL +=	/usr/bin/touch
 REQUIRED_TOOL +=	/usr/bin/tr
 REQUIRED_TOOL +=	/usr/perl5/bin/perl
-REQUIRED_TOOL +=	$(SPRO_ROOT)/bin/cc
+REQUIRED_TOOL +=	$(SPRO_VROOT)/bin/cc
 
 REQUIRED_FILE +=	/lib/libnsl.so
 REQUIRED_FILE +=	/lib/libsec.so
--- a/make-rules/shared-macros.mk	Fri Oct 15 16:16:53 2010 -0500
+++ b/make-rules/shared-macros.mk	Tue Oct 19 15:39:47 2010 -0500
@@ -81,14 +81,19 @@
 INSTALL_64 =		$(COMPONENT_SRC)/build-$(MACH64)/.installed
 INSTALL_32_and_64 =	$(INSTALL_32) $(INSTALL_64)
 
-SPRO_ROOT =	/opt/sunstudio12.1
+# BUILD_TOOLS is the root of all tools not normally installed on the system.
+BUILD_TOOLS =	/ws/onnv-tools
+
+SPRO_ROOT =	$(BUILD_TOOLS)/SUNWspro
+SPRO_VROOT =	$(SPRO_ROOT)/SS12
+
 GCC_ROOT =	/usr/gnu
 
-CC.studio.32 =	$(SPRO_ROOT)/bin/cc -m32
-CCC.studio.32 =	$(SPRO_ROOT)/bin/CC -m32
+CC.studio.32 =	$(SPRO_VROOT)/bin/cc -m32
+CCC.studio.32 =	$(SPRO_VROOT)/bin/CC -m32
 
-CC.studio.64 =	$(SPRO_ROOT)/bin/cc -m64
-CCC.studio.64 =	$(SPRO_ROOT)/bin/CC -m64
+CC.studio.64 =	$(SPRO_VROOT)/bin/cc -m64
+CCC.studio.64 =	$(SPRO_VROOT)/bin/CC -m64
 
 CC.gcc.32 =	$(GCC_ROOT)/bin/cc -m32
 CCC.gcc.32 =	$(GCC_ROOT)/bin/CC -m32
upstream/oracle/userland-gate