--- a/components/gcc45/gcc-45.p5m Fri Jan 23 17:31:40 2015 -0800
+++ b/components/gcc45/gcc-45.p5m Tue Feb 03 19:24:25 2015 -0800
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -40,23 +40,42 @@
# 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
+
+# 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
+link path=usr/bin/g++ target=../gcc/4.5/bin/g++ mediator=gcc \
+ mediator-version=4.5
link path=usr/bin/g++ target=../gcc/4.5/bin/g++ mediator=gcc \
mediator-version=4.5
link path=usr/bin/gcc target=../gcc/4.5/bin/gcc mediator=gcc \
mediator-version=4.5
+link path=usr/bin/gcc target=../gcc/4.5/bin/gcc mediator=gcc \
+ mediator-version=4.5
+link path=usr/bin/gcov target=../gcc/4.5/bin/gcov mediator=gcc \
+ mediator-version=4.5
link path=usr/bin/gcov target=../gcc/4.5/bin/gcov mediator=gcc \
mediator-version=4.5
link path=usr/bin/gcpp target=../gcc/4.5/bin/cpp mediator=gcc \
mediator-version=4.5
+link path=usr/bin/gcpp target=../gcc/4.5/bin/cpp 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/bin/gfortran target=../gcc/4.5/bin/gfortran mediator=gcc \
mediator-version=4.5
hardlink path=usr/gcc/4.5/bin/$(GNU_ARCH)-c++ target=$(GNU_ARCH)-g++
+hardlink path=usr/gcc/4.5/bin/$(GNU_ARCH)-c++ target=$(GNU_ARCH)-g++
file path=usr/gcc/4.5/bin/$(GNU_ARCH)-g++
hardlink path=usr/gcc/4.5/bin/$(GNU_ARCH)-gcc target=gcc
+hardlink path=usr/gcc/4.5/bin/$(GNU_ARCH)-gcc target=gcc
hardlink path=usr/gcc/4.5/bin/$(GNU_ARCH)-gfortran target=gfortran
+hardlink path=usr/gcc/4.5/bin/$(GNU_ARCH)-gfortran target=gfortran
+hardlink path=usr/gcc/4.5/bin/c++ target=$(GNU_ARCH)-g++
hardlink path=usr/gcc/4.5/bin/c++ target=$(GNU_ARCH)-g++
file path=usr/gcc/4.5/bin/cpp
hardlink path=usr/gcc/4.5/bin/g++ target=$(GNU_ARCH)-g++
+hardlink path=usr/gcc/4.5/bin/g++ target=$(GNU_ARCH)-g++
file path=usr/gcc/4.5/bin/gcc
file path=usr/gcc/4.5/bin/gcov
file path=usr/gcc/4.5/bin/gfortran
@@ -1092,12 +1111,13 @@
file path=usr/gcc/4.5/lib/libsupc++.a
file path=usr/gcc/4.5/share/info/cpp.info
file path=usr/gcc/4.5/share/info/cppinternals.info
+link path=usr/gcc/4.5/share/info/dir \
+ target=../../../../../var/info/usr_gcc_4.5_share_info_dir
file path=usr/gcc/4.5/share/info/gcc.info
file path=usr/gcc/4.5/share/info/gccinstall.info
file path=usr/gcc/4.5/share/info/gccint.info
file path=usr/gcc/4.5/share/info/gfortran.info
file path=usr/gcc/4.5/share/info/libgomp.info
-link path=usr/gcc/4.5/share/info/dir target=../../../../../var/info/usr_gcc_4.5_share_info_dir
file path=usr/gcc/4.5/share/locale/be/LC_MESSAGES/cpplib.mo
file path=usr/gcc/4.5/share/locale/be/LC_MESSAGES/gcc.mo
file path=usr/gcc/4.5/share/locale/ca/LC_MESSAGES/cpplib.mo
@@ -1140,88 +1160,55 @@
file path=usr/gcc/4.5/share/man/man7/fsf-funding.7
file path=usr/gcc/4.5/share/man/man7/gfdl.7
file path=usr/gcc/4.5/share/man/man7/gpl.7
-
-hardlink path=usr/gcc/4.5/bin/$(GNU_ARCH)-c++ target=$(GNU_ARCH)-g++
-hardlink path=usr/gcc/4.5/bin/$(GNU_ARCH)-gcc target=gcc
-hardlink path=usr/gcc/4.5/bin/$(GNU_ARCH)-gfortran target=gfortran
-hardlink path=usr/gcc/4.5/bin/c++ target=$(GNU_ARCH)-g++
-hardlink path=usr/gcc/4.5/bin/g++ target=$(GNU_ARCH)-g++
-
-# 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
-
-link path=usr/bin/g++ target=../gcc/4.5/bin/g++ \
- mediator=gcc mediator-version=4.5
-
-link path=usr/bin/gcc target=../gcc/4.5/bin/gcc \
- mediator=gcc mediator-version=4.5
-
-link path=usr/bin/gcov target=../gcc/4.5/bin/gcov \
- mediator=gcc mediator-version=4.5
-
-link path=usr/bin/gcpp target=../gcc/4.5/bin/cpp \
- 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
-
+ 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
-
+ 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
-
+ 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
-
+ target=../../../gcc/4.5/share/man/man1/cpp.1 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/fsf-funding.7 \
- target=../../../gcc/4.5/share/man/man7/fsf-funding.7 \
- mediator=gcc mediator-version=4.5
-
+ 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
-
+ target=../../../gcc/4.5/share/man/man7/gfdl.7 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
+ target=../../../gcc/4.5/share/man/man7/gpl.7 mediator=gcc \
+ mediator-version=4.5
+file usr/gcc/4.5/share/info/dir path=var/info/usr_gcc_4.5_share_info_dir \
+ mode=0644 preserve=true
+license gcc45.license license="GPLv3 with Runtime Exception"
+depend type=optional fmri=developer/[email protected]
+depend type=require fmri=__TBD pkg.debug.depend.file=usr/bin/as \
+ variant.arch=sparc
+depend type=require fmri=__TBD pkg.debug.depend.file=usr/bin/ld
-file usr/gcc/4.5/share/info/dir path=var/info/usr_gcc_4.5_share_info_dir mode=0644 preserve=true
-
-# 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
+# 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/gnu/bin/as type=require \
+depend type=require fmri=__TBD pkg.debug.depend.file=usr/gnu/bin/as \
+ variant.arch=i386
+depend type=require fmri=__TBD pkg.debug.depend.file=usr/lib/crt1.o \
variant.arch=i386
-depend fmri=__TBD pkg.debug.depend.file=usr/bin/as type=require \
- variant.arch=sparc
-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 \
+depend type=require fmri=__TBD pkg.debug.depend.file=usr/lib/crti.o \
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 \
+depend type=require fmri=__TBD pkg.debug.depend.file=usr/lib/crtn.o \
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=pkg:/system/header type=require
-depend type=optional fmri=developer/[email protected]
-depend type=require fmri=system/library/gcc-45-runtime@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
-
-license gcc45.license license="GPLv3 with Runtime Exception"
+depend type=require fmri=__TBD pkg.debug.depend.file=usr/lib/values-Xa.o
+depend type=require fmri=__TBD pkg.debug.depend.file=usr/lib/values-Xc.o
+depend type=require fmri=__TBD pkg.debug.depend.file=usr/lib/values-Xs.o
+depend type=require fmri=__TBD pkg.debug.depend.file=usr/lib/values-Xt.o
+depend type=require fmri=__TBD pkg.debug.depend.file=usr/lib/values-xpg4.o
+depend type=require fmri=__TBD pkg.debug.depend.file=usr/lib/values-xpg6.o
+depend type=require fmri=pkg:/system/header
+depend type=require \
+ fmri=system/library/gcc-45-runtime@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)