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.
16896301 mediator links in GCC 4.5 are broken (incomplete)
authorStefan Teleman <stefan.teleman@oracle.com>
Tue, 11 Jun 2013 11:42:22 -0700
changeset 1340 ed06bfb520fa
parent 1339 141f97d83ea8
child 1341 af3d6ef22d65
16896301 mediator links in GCC 4.5 are broken (incomplete)
components/gcc45/gcc-45-runtime.p5m file | annotate | diff | comparison | revisions
components/gcc45/gcc-45.p5m file | annotate | diff | comparison | revisions 
--- a/components/gcc45/gcc-45-runtime.p5m	Tue Jun 11 05:13:02 2013 -0700
+++ b/components/gcc45/gcc-45-runtime.p5m	Tue Jun 11 11:42:22 2013 -0700
@@ -44,6 +44,7 @@
 file path=usr/gcc/4.5/lib/libssp.so.0.0.0
 file path=usr/gcc/4.5/lib/libstdc++.so.6.0.14
 file path=usr/gcc/4.5/lib/$(MACH64)/libgcc_s.so.1
+    
 
 # pkg.debug.depend.path has been added to workaround a problem with pkgdepend not
 # being able to figure out the dependence of these .so's on libgcc_s which is
@@ -78,29 +79,105 @@
 link path=usr/gcc/4.5/lib/libstdc++.so target=libstdc++.so.6.0.14
 link path=usr/gcc/4.5/lib/libstdc++.so.6 target=libstdc++.so.6.0.14
 
-link path=usr/lib/libgcc_s.so.1 target=../gcc/4.5/lib/libgcc_s.so.1 
-link path=usr/lib/libgcc_s.so target=../gcc/4.5/lib/libgcc_s.so 
-link path=usr/lib/libgfortran.so target=../gcc/4.5/lib/libgfortran.so 
-link path=usr/lib/libgfortran.so.3 target=../gcc/4.5/lib/libgfortran.so.3 
-link path=usr/lib/libobjc.so target=../gcc/4.5/lib/libobjc.so 
-link path=usr/lib/libobjc.so.2 target=../gcc/4.5/lib/libobjc.so.2 
-link path=usr/lib/libstdc++.so target=../gcc/4.5/lib/libstdc++.so 
-link path=usr/lib/libstdc++.so.6 target=../gcc/4.5/lib/libstdc++.so.6 
-link path=usr/lib/libgomp.so target=../gcc/4.5/lib/libgomp.so 
-link path=usr/lib/libgomp.so.1 target=../gcc/4.5/lib/libgomp.so.1 
-link path=usr/lib/libssp.so target=../gcc/4.5/lib/libssp.so 
-link path=usr/lib/libssp.so.0 target=../gcc/4.5/lib/libssp.so.0 
-link path=usr/lib/$(MACH64)/libgcc_s.so.1 target=../../gcc/4.5/lib/$(MACH64)/libgcc_s.so.1 
-link path=usr/lib/$(MACH64)/libgcc_s.so target=../../gcc/4.5/lib/$(MACH64)/libgcc_s.so 
-link path=usr/lib/$(MACH64)/libgcc_s_$(MACH64).so target=../../gcc/4.5/lib/$(MACH64)/libgcc_s.so 
-link path=usr/lib/$(MACH64)/libgfortran.so target=../../gcc/4.5/lib/$(MACH64)/libgfortran.so 
-link path=usr/lib/$(MACH64)/libgfortran.so.3 target=../../gcc/4.5/lib/$(MACH64)/libgfortran.so.3 
-link path=usr/lib/$(MACH64)/libstdc++.so target=../../gcc/4.5/lib/$(MACH64)/libstdc++.so 
-link path=usr/lib/$(MACH64)/libstdc++.so.6 target=../../gcc/4.5/lib/$(MACH64)/libstdc++.so.6 
-link path=usr/lib/$(MACH64)/libgomp.so target=../../gcc/4.5/lib/$(MACH64)/libgomp.so 
-link path=usr/lib/$(MACH64)/libgomp.so.1 target=../../gcc/4.5/lib/$(MACH64)/libgomp.so.1 
-link path=usr/lib/$(MACH64)/libssp.so target=../../gcc/4.5/lib/$(MACH64)/libssp.so 
-link path=usr/lib/$(MACH64)/libssp.so.0 target=../../gcc/4.5/lib/$(MACH64)/libssp.so.0 
-link path=usr/lib/$(MACH64)/libobjc.so target=../../gcc/4.5/lib/$(MACH64)/libobjc.so 
-link path=usr/lib/$(MACH64)/libobjc.so.2 target=../../gcc/4.5/lib/$(MACH64)/libobjc.so.2 
+# Mediated links for GCC 4.5
+link path=usr/lib/libgcc_s.so.1 \
+    target=../gcc/4.5/lib/libgcc_s.so.1 \
+    mediator=gcc-runtime mediator-version=4.5
+    
+link path=usr/lib/libgcc_s.so \
+    target=../gcc/4.5/lib/libgcc_s.so \
+    mediator=gcc-runtime mediator-version=4.5
+    
+link path=usr/lib/libgfortran.so \
+    target=../gcc/4.5/lib/libgfortran.so  \
+    mediator=gcc-runtime mediator-version=4.5
+    
+link path=usr/lib/libgfortran.so.3 \
+    target=../gcc/4.5/lib/libgfortran.so.3 \
+    mediator=gcc-runtime mediator-version=4.5
+    
+link path=usr/lib/libobjc.so \
+    target=../gcc/4.5/lib/libobjc.so \
+    mediator=gcc-runtime mediator-version=4.5
+    
+link path=usr/lib/libobjc.so.2 \
+    target=../gcc/4.5/lib/libobjc.so.2 \
+    mediator=gcc-runtime mediator-version=4.5
+    
+link path=usr/lib/libstdc++.so \
+    target=../gcc/4.5/lib/libstdc++.so \
+    mediator=gcc-runtime mediator-version=4.5
+    
+link path=usr/lib/libstdc++.so.6 \
+    target=../gcc/4.5/lib/libstdc++.so.6 \
+    mediator=gcc-runtime mediator-version=4.5
+    
+link path=usr/lib/libgomp.so \
+    target=../gcc/4.5/lib/libgomp.so \
+    mediator=gcc-runtime mediator-version=4.5
+    
+link path=usr/lib/libgomp.so.1 \
+    target=../gcc/4.5/lib/libgomp.so.1 \
+    mediator=gcc-runtime mediator-version=4.5
+    
+link path=usr/lib/libssp.so \
+    target=../gcc/4.5/lib/libssp.so \
+    mediator=gcc-runtime mediator-version=4.5
+    
+link path=usr/lib/libssp.so.0 \
+    target=../gcc/4.5/lib/libssp.so.0 \
+    mediator=gcc-runtime mediator-version=4.5
+    
+link path=usr/lib/$(MACH64)/libgcc_s.so.1 \
+    target=../../gcc/4.5/lib/$(MACH64)/libgcc_s.so.1 \
+    mediator=gcc-runtime mediator-version=4.5
+    
+link path=usr/lib/$(MACH64)/libgcc_s.so \
+    target=../../gcc/4.5/lib/$(MACH64)/libgcc_s.so \
+    mediator=gcc-runtime mediator-version=4.5
+    
+link path=usr/lib/$(MACH64)/libgcc_s_$(MACH64).so \
+    target=../../gcc/4.5/lib/$(MACH64)/libgcc_s.so \
+    mediator=gcc-runtime mediator-version=4.5
+    
+link path=usr/lib/$(MACH64)/libgfortran.so \
+    target=../../gcc/4.5/lib/$(MACH64)/libgfortran.so \
+    mediator=gcc-runtime mediator-version=4.5
+    
+link path=usr/lib/$(MACH64)/libgfortran.so.3 \
+    target=../../gcc/4.5/lib/$(MACH64)/libgfortran.so.3 \
+    mediator=gcc-runtime mediator-version=4.5
+    
+link path=usr/lib/$(MACH64)/libstdc++.so \
+    target=../../gcc/4.5/lib/$(MACH64)/libstdc++.so \
+    mediator=gcc-runtime mediator-version=4.5
+    
+link path=usr/lib/$(MACH64)/libstdc++.so.6 \
+    target=../../gcc/4.5/lib/$(MACH64)/libstdc++.so.6 \
+    mediator=gcc-runtime mediator-version=4.5
+    
+link path=usr/lib/$(MACH64)/libgomp.so \
+    target=../../gcc/4.5/lib/$(MACH64)/libgomp.so \
+    mediator=gcc-runtime mediator-version=4.5
+    
+link path=usr/lib/$(MACH64)/libgomp.so.1 \
+    target=../../gcc/4.5/lib/$(MACH64)/libgomp.so.1 \
+    mediator=gcc-runtime mediator-version=4.5
+    
+link path=usr/lib/$(MACH64)/libssp.so \
+    target=../../gcc/4.5/lib/$(MACH64)/libssp.so \
+    mediator=gcc-runtime mediator-version=4.5
+    
+link path=usr/lib/$(MACH64)/libssp.so.0 \
+    target=../../gcc/4.5/lib/$(MACH64)/libssp.so.0 \
+    mediator=gcc-runtime mediator-version=4.5
+    
+link path=usr/lib/$(MACH64)/libobjc.so \
+    target=../../gcc/4.5/lib/$(MACH64)/libobjc.so \
+    mediator=gcc-runtime mediator-version=4.5
+    
+link path=usr/lib/$(MACH64)/libobjc.so.2 \
+    target=../../gcc/4.5/lib/$(MACH64)/libobjc.so.2 \
+    mediator=gcc-runtime mediator-version=4.5
+    
 
--- a/components/gcc45/gcc-45.p5m	Tue Jun 11 05:13:02 2013 -0700
+++ b/components/gcc45/gcc-45.p5m	Tue Jun 11 11:42:22 2013 -0700
@@ -1420,48 +1420,55 @@
 
 # Mediated links for gcc binaries in /usr/bin
 link path=usr/bin/c++ target=../gcc/4.5/bin/c++ \
-     mediator=gcc mediator-version=4.5
+    mediator=gcc mediator-version=4.5
+    
 link path=usr/bin/g++ target=../gcc/4.5/bin/g++ \
-     mediator=gcc mediator-version=4.5
+    mediator=gcc mediator-version=4.5
+    
 link path=usr/bin/gcc target=../gcc/4.5/bin/gcc \
-     mediator=gcc mediator-version=4.5
+    mediator=gcc mediator-version=4.5
+    
 link path=usr/bin/gcov target=../gcc/4.5/bin/gcov \
-     mediator=gcc mediator-version=4.5
+    mediator=gcc mediator-version=4.5
+    
 link path=usr/bin/gcpp target=../gcc/4.5/bin/cpp \
-     mediator=gcc mediator-version=4.5
-
-# gfortran is not mediated (equivalent binary in gcc3 is g77).
-link path=usr/bin/gfortran target=../gcc/4.5/bin/gfortran
-
-# Mediated links for gcc man pages in /usr/share/man
-link path=usr/share/man/man1/c++.1 \
-    target=../../../gcc/4.5/share/man/man1/g++.1 \
     mediator=gcc mediator-version=4.5
+    
+link path=usr/bin/gfortran target=../gcc/4.5/bin/gfortran \
+    mediator=gcc mediator-version=4.5
+    
 link path=usr/share/man/man1/g++.1 \
     target=../../../gcc/4.5/share/man/man1/g++.1 \
     mediator=gcc mediator-version=4.5
+    
 link path=usr/share/man/man1/gcc.1 \
     target=../../../gcc/4.5/share/man/man1/gcc.1 \
     mediator=gcc mediator-version=4.5
+    
 link path=usr/share/man/man1/gcov.1 \
     target=../../../gcc/4.5/share/man/man1/gcov.1 \
     mediator=gcc mediator-version=4.5
+    
 link path=usr/share/man/man1/gcpp.1 \
     target=../../../gcc/4.5/share/man/man1/cpp.1 \
     mediator=gcc mediator-version=4.5
+    
 link path=usr/share/man/man7/fsf-funding.7 \
     target=../../../gcc/4.5/share/man/man7/fsf-funding.7 \
     mediator=gcc mediator-version=4.5
+    
 link path=usr/share/man/man7/gfdl.7 \
     target=../../../gcc/4.5/share/man/man7/gfdl.7 \
     mediator=gcc mediator-version=4.5
+    
+link path=usr/share/man/man1/gfortran.1 \
+    target=../../../gcc/4.5/share/man/man1/gfortran.1 \
+    mediator=gcc mediator-version=4.5
+    
 link path=usr/share/man/man7/gpl.7 \
     target=../../../gcc/4.5/share/man/man7/gpl.7 \
     mediator=gcc mediator-version=4.5
-
-# gfortran.1 is not mediated (equivalent man page in gcc3 is g77.1).
-link path=usr/share/man/man1/gfortran.1 \
-    target=../../../gcc/4.5/share/man/man1/gfortran.1
+    
 
 # 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
upstream/oracle/userland-gate