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.
22820866 Userland should build with GCC 5.3
authorNorm Jacobs <Norm.Jacobs@Oracle.COM>
Sat, 09 Apr 2016 14:55:50 -0700
changeset 5788 ead8ecaa722e
parent 5787 c0615d62b41a
child 5789 5183fa4a46ce
22820866 Userland should build with GCC 5.3
components/desktop/firefox/Makefile file | annotate | diff | comparison | revisions
components/gcc3/Makefile file | annotate | diff | comparison | revisions
components/gcc53/developer-gcc-gcc-c++-53.p5m file | annotate | diff | comparison | revisions
components/gcc53/developer-gcc-gcc-c-53.p5m file | annotate | diff | comparison | revisions
components/gcc53/developer-gcc-gcc-gfortran-53.p5m file | annotate | diff | comparison | revisions
components/gcc53/developer-gcc-gcc-gobjc-53.p5m file | annotate | diff | comparison | revisions
make-rules/shared-macros.mk file | annotate | diff | comparison | revisions 
--- a/components/desktop/firefox/Makefile	Sun Apr 03 22:57:07 2016 -0700
+++ b/components/desktop/firefox/Makefile	Sat Apr 09 14:55:50 2016 -0700
@@ -30,6 +30,9 @@
 
 include ../../../make-rules/shared-macros.mk
 
+# gcc 5.3 can't compile this version of firefox yet, so keep using 4.8 for now.
+GCC_ROOT = /usr/gcc/4.8
+
 COMPONENT_NAME =		firefox
 COMPONENT_VERSION =		38.5.0esr
 COMPONENT_PROJECT_URL =		http://www.mozilla.com/firefox
--- a/components/gcc3/Makefile	Sun Apr 03 22:57:07 2016 -0700
+++ b/components/gcc3/Makefile	Sat Apr 09 14:55:50 2016 -0700
@@ -27,6 +27,9 @@
 COMPILER= gcc
 include ../../make-rules/shared-macros.mk
 
+# build with itself until it's gone
+GCC_ROOT =	/usr/gcc/3.4
+
 COMPONENT_NAME=		gcc
 COMPONENT_VERSION=	3.4.3
 COMPONENT_PROJECT_URL=	http://gcc.gnu.org/
--- a/components/gcc53/developer-gcc-gcc-c++-53.p5m	Sun Apr 03 22:57:07 2016 -0700
+++ b/components/gcc53/developer-gcc-gcc-c++-53.p5m	Sat Apr 09 14:55:50 2016 -0700
@@ -825,7 +825,5 @@
 license COPYING3.LIB license=LGPLv3
 depend type=require fmri=pkg:/developer/gcc/gcc-c-$(GCC_V)
 depend type=require fmri=pkg:/developer/gcc/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)
-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/gcc53/developer-gcc-gcc-c-53.p5m	Sun Apr 03 22:57:07 2016 -0700
+++ b/components/gcc53/developer-gcc-gcc-c-53.p5m	Sat Apr 09 14:55:50 2016 -0700
@@ -73,5 +73,4 @@
 license COPYING.LIB license=LGPLv2.1
 license COPYING3.LIB license=LGPLv3
 depend type=require fmri=pkg:/developer/gcc/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/gcc53/developer-gcc-gcc-gfortran-53.p5m	Sun Apr 03 22:57:07 2016 -0700
+++ b/components/gcc53/developer-gcc-gcc-gfortran-53.p5m	Sat Apr 09 14:55:50 2016 -0700
@@ -94,7 +94,6 @@
 license COPYING3.LIB license=LGPLv3
 depend type=require fmri=pkg:/developer/gcc/gcc-c-$(GCC_V)
 depend type=require fmri=pkg:/developer/gcc/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)
 depend type=require fmri=pkg:/system/library/gcc/gcc-gfortran-runtime
 depend type=require fmri=pkg:/system/library/gcc/gcc-gfortran-runtime-$(GCC_V)
--- a/components/gcc53/developer-gcc-gcc-gobjc-53.p5m	Sun Apr 03 22:57:07 2016 -0700
+++ b/components/gcc53/developer-gcc-gcc-gobjc-53.p5m	Sat Apr 09 14:55:50 2016 -0700
@@ -62,9 +62,7 @@
 depend type=require fmri=pkg:/developer/gcc/gcc-c++-$(GCC_V)
 depend type=require fmri=pkg:/developer/gcc/gcc-c-$(GCC_V)
 depend type=require fmri=pkg:/developer/gcc/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)
-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-gobjc-runtime
 depend type=require fmri=pkg:/system/library/gcc/gcc-gobjc-runtime-$(GCC_V)
--- a/make-rules/shared-macros.mk	Sun Apr 03 22:57:07 2016 -0700
+++ b/make-rules/shared-macros.mk	Sat Apr 09 14:55:50 2016 -0700
@@ -470,7 +470,7 @@
 export PARFAIT_NATIVEGCC=$(GCC_ROOT)/bin/gcc
 export PARFAIT_NATIVEGXX=$(GCC_ROOT)/bin/g++
 
-GCC_ROOT =	/usr/gcc/4.8
+GCC_ROOT =	/usr/gcc/5.3
 
 CC.studio.32 =	$(SPRO_VROOT)/bin/cc
 CXX.studio.32 =	$(SPRO_VROOT)/bin/CC
@@ -1041,7 +1041,7 @@
 REQUIRED_PACKAGES += developer/build/gnu-make
 REQUIRED_PACKAGES += developer/build/make
 ifeq ($(COMPILER),gcc)
-REQUIRED_PACKAGES += developer/gcc-48
+REQUIRED_PACKAGES += developer/gcc-53
 endif
 ifeq ($(COMPILER),studio)
 ifneq ($(findstring /opt/solarisstudio12.4,$(CC)),)
upstream/oracle/userland-gate