18419497 building R with gcc fails on build 43
authorNorm Jacobs <Norm.Jacobs@Sun.COM>
Wed, 19 Mar 2014 22:31:16 -0500
changeset 1773 1462914de989
parent 1772 6f53e94c4c78
child 1774 aeb0b066aaf3
18419497 building R with gcc fails on build 43
components/gcc47/developer-gcc4-gcc-c++-47.p5m
components/gcc47/developer-gcc4-gcc-c-47.p5m
components/gcc47/developer-gcc4-gcc-gfortran-47.p5m
components/gcc47/developer-gcc4-gcc-gobjc-47.p5m
components/gcc48/developer-gcc4-gcc-c++-48.p5m
components/gcc48/developer-gcc4-gcc-c-48.p5m
components/gcc48/developer-gcc4-gcc-gfortran-48.p5m
components/gcc48/developer-gcc4-gcc-gobjc-48.p5m
--- a/components/gcc47/developer-gcc4-gcc-c++-47.p5m	Wed Mar 19 16:24:36 2014 -0700
+++ b/components/gcc47/developer-gcc4-gcc-c++-47.p5m	Wed Mar 19 22:31:16 2014 -0500
@@ -767,6 +767,7 @@
 license gcc$(GCC_V).license license="GPLv3 with Runtime Exception"
 depend type=require fmri=pkg:/developer/gcc-4/gcc-c-$(GCC_V)
 depend type=require fmri=pkg:/developer/gcc-4/gcc-common-$(GCC_V)
+depend type=require fmri=pkg:/system/library/gcc/gcc-c-runtime
 depend type=require fmri=pkg:/system/library/gcc/gcc-c++-runtime
-depend type=require fmri=pkg:/system/library/gcc/gcc-c-runtime
-
+depend type=require fmri=pkg:/system/library/gcc/gcc-c-runtime-$(GCC_V)
+depend type=require fmri=pkg:/system/library/gcc/gcc-c++-runtime-$(GCC_V)
--- a/components/gcc47/developer-gcc4-gcc-c-47.p5m	Wed Mar 19 16:24:36 2014 -0700
+++ b/components/gcc47/developer-gcc4-gcc-c-47.p5m	Wed Mar 19 22:31:16 2014 -0500
@@ -67,4 +67,5 @@
 license gcc$(GCC_V).license license="GPLv3 with Runtime Exception"
 depend type=require fmri=pkg:/developer/gcc-4/gcc-common-$(GCC_V)
 depend type=require fmri=pkg:/system/library/gcc/gcc-c-runtime
+depend type=require fmri=pkg:/system/library/gcc/gcc-c-runtime-$(GCC_V)
 
--- a/components/gcc47/developer-gcc4-gcc-gfortran-47.p5m	Wed Mar 19 16:24:36 2014 -0700
+++ b/components/gcc47/developer-gcc4-gcc-gfortran-47.p5m	Wed Mar 19 22:31:16 2014 -0500
@@ -53,4 +53,5 @@
 depend type=require fmri=pkg:/developer/gcc-4/gcc-common-$(GCC_V)
 depend type=require fmri=pkg:/system/library/gcc/gcc-c-runtime
 depend type=require fmri=pkg:/system/library/gcc/gcc-gfortran-runtime
-
+depend type=require fmri=pkg:/system/library/gcc/gcc-c-runtime-$(GCC_V)
+depend type=require fmri=pkg:/system/library/gcc/gcc-gfortran-runtime-$(GCC_V)
--- a/components/gcc47/developer-gcc4-gcc-gobjc-47.p5m	Wed Mar 19 16:24:36 2014 -0700
+++ b/components/gcc47/developer-gcc4-gcc-gobjc-47.p5m	Wed Mar 19 22:31:16 2014 -0500
@@ -55,4 +55,6 @@
 depend type=require fmri=pkg:/system/library/gcc/gcc-c++-runtime
 depend type=require fmri=pkg:/system/library/gcc/gcc-c-runtime
 depend type=require fmri=pkg:/system/library/gcc/gcc-gobjc-runtime
-
+depend type=require fmri=pkg:/system/library/gcc/gcc-c++-runtime-$(GCC_V)
+depend type=require fmri=pkg:/system/library/gcc/gcc-c-runtime-$(GCC_V)
+depend type=require fmri=pkg:/system/library/gcc/gcc-gobjc-runtime-$(GCC_V)
--- a/components/gcc48/developer-gcc4-gcc-c++-48.p5m	Wed Mar 19 16:24:36 2014 -0700
+++ b/components/gcc48/developer-gcc4-gcc-c++-48.p5m	Wed Mar 19 22:31:16 2014 -0500
@@ -778,3 +778,5 @@
 depend type=require fmri=pkg:/developer/gcc-4/gcc-common-$(GCC_V)
 depend type=require fmri=pkg:/system/library/gcc/gcc-c++-runtime
 depend type=require fmri=pkg:/system/library/gcc/gcc-c-runtime
+depend type=require fmri=pkg:/system/library/gcc/gcc-c++-runtime-$(GCC_V)
+depend type=require fmri=pkg:/system/library/gcc/gcc-c-runtime-$(GCC_V)
--- a/components/gcc48/developer-gcc4-gcc-c-48.p5m	Wed Mar 19 16:24:36 2014 -0700
+++ b/components/gcc48/developer-gcc4-gcc-c-48.p5m	Wed Mar 19 22:31:16 2014 -0500
@@ -67,3 +67,4 @@
 license gcc$(GCC_V).license license="GPLv3 with Runtime Exception"
 depend type=require fmri=pkg:/developer/gcc-4/gcc-common-$(GCC_V)
 depend type=require fmri=pkg:/system/library/gcc/gcc-c-runtime
+depend type=require fmri=pkg:/system/library/gcc/gcc-c-runtime-$(GCC_V)
--- a/components/gcc48/developer-gcc4-gcc-gfortran-48.p5m	Wed Mar 19 16:24:36 2014 -0700
+++ b/components/gcc48/developer-gcc4-gcc-gfortran-48.p5m	Wed Mar 19 22:31:16 2014 -0500
@@ -53,3 +53,5 @@
 depend type=require fmri=pkg:/developer/gcc-4/gcc-common-$(GCC_V)
 depend type=require fmri=pkg:/system/library/gcc/gcc-c-runtime
 depend type=require fmri=pkg:/system/library/gcc/gcc-gfortran-runtime
+depend type=require fmri=pkg:/system/library/gcc/gcc-c-runtime-$(GCC_V)
+depend type=require fmri=pkg:/system/library/gcc/gcc-gfortran-runtime-$(GCC_V)
--- a/components/gcc48/developer-gcc4-gcc-gobjc-48.p5m	Wed Mar 19 16:24:36 2014 -0700
+++ b/components/gcc48/developer-gcc4-gcc-gobjc-48.p5m	Wed Mar 19 22:31:16 2014 -0500
@@ -55,3 +55,6 @@
 depend type=require fmri=pkg:/system/library/gcc/gcc-c++-runtime
 depend type=require fmri=pkg:/system/library/gcc/gcc-c-runtime
 depend type=require fmri=pkg:/system/library/gcc/gcc-gobjc-runtime
+depend type=require fmri=pkg:/system/library/gcc/gcc-c++-runtime-$(GCC_V)
+depend type=require fmri=pkg:/system/library/gcc/gcc-c-runtime-$(GCC_V)
+depend type=require fmri=pkg:/system/library/gcc/gcc-gobjc-runtime-$(GCC_V)