--- a/components/gcc45/gcc-45-runtime.p5m Wed Jun 26 14:16:16 2013 -0700
+++ b/components/gcc45/gcc-45-runtime.p5m Fri Jun 28 08:41:58 2013 -0700
@@ -24,6 +24,7 @@
set name=pkg.fmri value=pkg:/system/library/gcc-45-runtime@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="GCC - 4.5 Runtime"
set name=com.oracle.info.description value="the GNU Compiler Collection"
+set name=com.oracle.info.tpno value=4456
set name=info.classification value="org.opensolaris.category.2008:Development/C" \
value="org.opensolaris.category.2008:Development/C++" \
value="org.opensolaris.category.2008:Development/Fortran" \
@@ -36,17 +37,6 @@
license gcc45.license license='GPLv3 with Runtime Exception'
-dir path=usr
-dir path=usr/lib
-dir path=usr/lib/$(MACH64)
-dir path=usr/gcc
-dir path=usr/gcc/4.5
-dir path=usr/gcc/4.5/lib
-dir path=usr/gcc/4.5/lib/$(MACH64)
-dir path=usr/gcc/4.5/lib/gcc
-dir path=usr/gcc/4.5/lib/gcc/$(GNU_ARCH)
-dir path=usr/gcc/4.5/lib/gcc/$(GNU_ARCH)/$(COMPONENT_VERSION)
-dir path=usr/gcc/4.5/lib/gcc/$(GNU_ARCH)/$(COMPONENT_VERSION)/$(MACH64)
file path=usr/gcc/4.5/lib/libgcc_s.so.1
file path=usr/gcc/4.5/lib/libgfortran.so.3.0.0
file path=usr/gcc/4.5/lib/libgomp.so.1.0.0
@@ -88,29 +78,103 @@
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