--- a/components/gcc47/system-library-gcc-gcc-c-runtime-47.p5m Fri Jan 23 17:31:40 2015 -0800
+++ b/components/gcc47/system-library-gcc-gcc-c-runtime-47.p5m Tue Feb 03 19:24:25 2015 -0800
@@ -18,12 +18,16 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
value=pkg:/system/library/gcc/gcc-c-runtime-$(GCC_V)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="GCC $(GCC_VERSION) - C Runtime"
+#
+# temporary, until the mediated links are replaced in the reference repo
+set name=pkg.linted.pkglint.dupaction001.1 value=true
+set name=pkg.linted.pkglint.dupaction010.2 value=true
set name=com.oracle.info.description \
value="the GNU Compiler Collection - C Runtime Libraries"
set name=com.oracle.info.tpno value=$(TPNO)
@@ -34,10 +38,6 @@
set name=org.opensolaris.arc-caseid value=PSARC/2012/373
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
#
-# temporary, until the mediated links are replaced in the reference repo
-set name=pkg.linted.pkglint.dupaction001.1 value=true
-set name=pkg.linted.pkglint.dupaction010.2 value=true
-#
link path=$(GCC_BASEDIR)/lib/$(MACH64)/libgcc_s.so target=libgcc_s.so.1
file path=$(GCC_BASEDIR)/lib/$(MACH64)/libgcc_s.so.1
link path=$(GCC_BASEDIR)/lib/$(MACH64)/libgomp.so target=libgomp.so.1.0.0
@@ -46,8 +46,8 @@
link path=$(GCC_BASEDIR)/lib/$(MACH64)/libitm.so target=libitm.so.1.0.0
link path=$(GCC_BASEDIR)/lib/$(MACH64)/libitm.so.1 target=libitm.so.1.0.0
file path=$(GCC_BASEDIR)/lib/$(MACH64)/libitm.so.1.0.0
-link path=$(GCC_BASEDIR)/lib/$(MACH64)/libquadmath.so target=libquadmath.so.0.0.0 \
- variant.arch=i386
+link path=$(GCC_BASEDIR)/lib/$(MACH64)/libquadmath.so \
+ target=libquadmath.so.0.0.0 variant.arch=i386
link path=$(GCC_BASEDIR)/lib/$(MACH64)/libquadmath.so.0 \
target=libquadmath.so.0.0.0 variant.arch=i386
file path=$(GCC_BASEDIR)/lib/$(MACH64)/libquadmath.so.0.0.0 variant.arch=i386