7116108 gcc3 and gcc45 need their manual dependencies adjusted
authorRich Burridge <rich.burridge@oracle.com>
Tue, 29 Nov 2011 05:42:26 -0800
changeset 602 96ed36254e88
parent 601 5502502b0840
child 603 1b966e9a6b03
7116108 gcc3 and gcc45 need their manual dependencies adjusted
components/gcc3/gcc-3.p5m
components/gcc45/gcc-45.p5m
--- a/components/gcc3/gcc-3.p5m	Tue Nov 29 02:00:30 2011 -0800
+++ b/components/gcc3/gcc-3.p5m	Tue Nov 29 05:42:26 2011 -0800
@@ -478,11 +478,18 @@
 
 license gcc.license license="GPLv2"
 
+# gcc 3.4.3 on x86 uses the CRT files in /usr/lib plus the GNU assembler,
+# and gcc 3.4.3 on SPARC does not.  Any upgrade to this package should
+# reverify this and adjust the following CRT related dependencies accordingly.
 depend fmri=__TBD pkg.debug.depend.file=usr/bin/ld type=require
-depend fmri=__TBD pkg.debug.depend.file=usr/gnu/bin/as type=require
-depend fmri=__TBD pkg.debug.depend.file=usr/lib/crt1.o type=require variant.arch=i386
-depend fmri=__TBD pkg.debug.depend.file=usr/lib/crti.o type=require
-depend fmri=__TBD pkg.debug.depend.file=usr/lib/crtn.o type=require
+depend fmri=__TBD pkg.debug.depend.file=usr/gnu/bin/as type=require \
+    variant.arch=i386
+depend fmri=__TBD pkg.debug.depend.file=usr/lib/crt1.o type=require \
+    variant.arch=i386
+depend fmri=__TBD pkg.debug.depend.file=usr/lib/crti.o type=require \
+    variant.arch=i386
+depend fmri=__TBD pkg.debug.depend.file=usr/lib/crtn.o type=require \
+    variant.arch=i386
 depend fmri=__TBD pkg.debug.depend.file=usr/lib/values-Xa.o type=require
 depend fmri=__TBD pkg.debug.depend.file=usr/lib/values-Xc.o type=require
 depend fmri=__TBD pkg.debug.depend.file=usr/lib/values-Xs.o type=require
--- a/components/gcc45/gcc-45.p5m	Tue Nov 29 02:00:30 2011 -0800
+++ b/components/gcc45/gcc-45.p5m	Tue Nov 29 05:42:26 2011 -0800
@@ -1566,7 +1566,22 @@
 link path=usr/share/man/man7/gfdl.7 target=../../../gcc/4.5/share/man/man7/gfdl.7
 link path=usr/share/man/man7/gpl.7 target=../../../gcc/4.5/share/man/man7/gpl.7
 
-
+# gcc 4.5 on x86 uses the CRT files in /usr/lib, and gcc 4.5 on SPARC 
+# does not.  Any upgrade to this package should reverify this and adjust 
+# the following CRT related dependencies accordingly.
 depend fmri=__TBD pkg.debug.depend.file=usr/bin/as type=require
+depend fmri=__TBD pkg.debug.depend.file=usr/bin/ld type=require
+depend fmri=__TBD pkg.debug.depend.file=usr/lib/crt1.o type=require \
+    variant.arch=i386
+depend fmri=__TBD pkg.debug.depend.file=usr/lib/crti.o type=require \
+    variant.arch=i386
+depend fmri=__TBD pkg.debug.depend.file=usr/lib/crtn.o type=require \
+    variant.arch=i386
+depend fmri=__TBD pkg.debug.depend.file=usr/lib/values-Xa.o type=require
+depend fmri=__TBD pkg.debug.depend.file=usr/lib/values-Xc.o type=require
+depend fmri=__TBD pkg.debug.depend.file=usr/lib/values-Xs.o type=require
+depend fmri=__TBD pkg.debug.depend.file=usr/lib/values-Xt.o type=require
+depend fmri=__TBD pkg.debug.depend.file=usr/lib/values-xpg4.o type=require
+depend fmri=__TBD pkg.debug.depend.file=usr/lib/values-xpg6.o type=require
 depend fmri=__TBD pkg.debug.depend.file=usr/lib/libstdc++.so type=require
 depend type=optional fmri=developer/[email protected]