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.
18065425 parfait gcc wrappers should force gcc3 for now
authorMike Sullivan <Mike.Sullivan@Oracle.COM>
Fri, 17 Jan 2014 11:50:07 -0800
changeset 1645 ff50a80c552a
parent 1644 99106880f744
child 1646 6f853cd59489
18065425 parfait gcc wrappers should force gcc3 for now
components/acpidump/Makefile file | annotate | diff | comparison | revisions
components/autogen/Makefile file | annotate | diff | comparison | revisions
components/bcc/Makefile file | annotate | diff | comparison | revisions
components/clisp/Makefile file | annotate | diff | comparison | revisions
components/erlang/Makefile file | annotate | diff | comparison | revisions
components/guile/Makefile file | annotate | diff | comparison | revisions
components/indri/Makefile file | annotate | diff | comparison | revisions
components/jsl/Makefile file | annotate | diff | comparison | revisions
components/libnet/Makefile file | annotate | diff | comparison | revisions
components/nmap/Makefile file | annotate | diff | comparison | revisions
components/openscap/Makefile file | annotate | diff | comparison | revisions
components/openusb/Makefile file | annotate | diff | comparison | revisions
components/python/greenlet/Makefile file | annotate | diff | comparison | revisions
components/rsyslog/Makefile file | annotate | diff | comparison | revisions
components/samba/samba/Makefile file | annotate | diff | comparison | revisions
components/squid/Makefile file | annotate | diff | comparison | revisions
components/webalizer/Makefile file | annotate | diff | comparison | revisions
tools/Makefile file | annotate | diff | comparison | revisions 
--- a/components/acpidump/Makefile	Fri Jan 17 10:38:31 2014 -0800
+++ b/components/acpidump/Makefile	Fri Jan 17 11:50:07 2014 -0800
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
 #
 
 include ../../make-rules/shared-macros.mk
@@ -49,10 +49,6 @@
 PKG_PROTO_DIRS += $(BUILD_DIR_32)
 
 COMPILER =	gcc
-# Parfait doesn't work with the GNU 4.7 compilers yet.
-ifeq   ($(strip $(PARFAIT_BUILD)),yes)
-COMPILER =	gcc3
-endif
 
 COMPONENT_BUILD_ENV  +=		CC=$(CC)
 
--- a/components/autogen/Makefile	Fri Jan 17 10:38:31 2014 -0800
+++ b/components/autogen/Makefile	Fri Jan 17 11:50:07 2014 -0800
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
 #
 include ../../make-rules/shared-macros.mk
 
@@ -41,10 +41,6 @@
 
 # built in SFW with gcc and builds cleanly now only with gcc
 COMPILER =	gcc
-# Parfait doesn't work with the GNU 4.7 compilers yet.
-ifeq   ($(strip $(PARFAIT_BUILD)),yes)
-COMPILER =	gcc3
-endif
 CONFIGURE_OPTIONS +=	CFLAGS="$(CFLAGS)"
 
 # strip the environment or install target fails
--- a/components/bcc/Makefile	Fri Jan 17 10:38:31 2014 -0800
+++ b/components/bcc/Makefile	Fri Jan 17 11:50:07 2014 -0800
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
 #
 
 include ../../make-rules/shared-macros.mk
@@ -40,10 +40,6 @@
 include ../../make-rules/ips.mk
 
 COMPILER =	gcc
-# Parfait doesn't work with the GNU 4.7 compilers yet.
-ifeq   ($(strip $(PARFAIT_BUILD)),yes)
-COMPILER =	gcc3
-endif
 
 COMPONENT_PRE_CONFIGURE_ACTION = ($(CLONEY) $(SOURCE_DIR) $(@D))
 
--- a/components/clisp/Makefile	Fri Jan 17 10:38:31 2014 -0800
+++ b/components/clisp/Makefile	Fri Jan 17 11:50:07 2014 -0800
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
 #
 
 include ../../make-rules/shared-macros.mk
@@ -59,10 +59,6 @@
 	$(COMPONENT_POST_CONFIGURE_ACTION.$(MACH))
 
 COMPILER=	gcc
-# Parfait doesn't work with the GNU 4.7 compilers yet.
-ifeq   ($(strip $(PARFAIT_BUILD)),yes)
-COMPILER =	gcc3
-endif
 
 PATCH_LEVEL=	0
 
--- a/components/erlang/Makefile	Fri Jan 17 10:38:31 2014 -0800
+++ b/components/erlang/Makefile	Fri Jan 17 11:50:07 2014 -0800
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
 #
 
 include ../../make-rules/shared-macros.mk
@@ -71,10 +71,6 @@
 
 # Built in SFW with gcc and builds cleanly now only with gcc
 COMPILER =	gcc
-# Parfait doesn't work with the GNU 4.7 compilers yet.
-ifeq   ($(strip $(PARFAIT_BUILD)),yes)
-COMPILER =	gcc3
-endif
 
 CONFIGURE_OPTIONS += CFLAGS="$(CFLAGS)"
 CONFIGURE_OPTIONS += CPPFLAGS="$(CPPFLAGS) -I/usr/include/gd2"
--- a/components/guile/Makefile	Fri Jan 17 10:38:31 2014 -0800
+++ b/components/guile/Makefile	Fri Jan 17 11:50:07 2014 -0800
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
 #
 include ../../make-rules/shared-macros.mk
 
@@ -38,10 +38,6 @@
 
 # Built in SFW with gcc and builds cleanly now only with gcc
 COMPILER =	gcc
-# Parfait doesn't work with the GNU 4.7 compilers yet.
-ifeq   ($(strip $(PARFAIT_BUILD)),yes)
-COMPILER =	gcc3
-endif
 CONFIGURE_OPTIONS +=	CPPFLAGS="-I/usr/include/gmp -D__USE_LEGACY_PROTOTYPES__"
 CONFIGURE_OPTIONS +=	--disable-static 
 CONFIGURE_OPTIONS +=	--disable-error-on-warning
--- a/components/indri/Makefile	Fri Jan 17 10:38:31 2014 -0800
+++ b/components/indri/Makefile	Fri Jan 17 11:50:07 2014 -0800
@@ -41,10 +41,6 @@
 
 COMPONENT_PRE_CONFIGURE_ACTION	 = $(CLONEY) $(SOURCE_DIR) $(@D)
 COMPILER			 = gcc
-# Parfait doesn't work with the GNU 4.7 compilers yet.
-ifeq   ($(strip $(PARFAIT_BUILD)),yes)
-COMPILER =      gcc3
-endif
 CONFIGURE_OPTIONS		+= "CFLAGS=$(CFLAGS)"
 CONFIGURE_OPTIONS		+= "CXXFLAGS=$(CXXFLAGS)"
 CONFIGURE_OPTIONS		+= "LDFLAGS=$(LDFLAGS)"
--- a/components/jsl/Makefile	Fri Jan 17 10:38:31 2014 -0800
+++ b/components/jsl/Makefile	Fri Jan 17 11:50:07 2014 -0800
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
 #
 include ../../make-rules/shared-macros.mk
 
@@ -40,10 +40,6 @@
 # some assembler code is required for locking which fails to compile on
 # solaris, when using gcc this is inlined (see jslock.c)
 COMPILER =	gcc
-# Parfait doesn't work with the GNU 4.7 compilers yet.
-ifeq   ($(strip $(PARFAIT_BUILD)),yes)
-COMPILER =	gcc3
-endif
 
 COMPONENT_BUILD_ARGS += -f src/Makefile
 COMPONENT_BUILD_ARGS += CC="$(CC)"
--- a/components/libnet/Makefile	Fri Jan 17 10:38:31 2014 -0800
+++ b/components/libnet/Makefile	Fri Jan 17 11:50:07 2014 -0800
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
 #
 
 include ../../make-rules/shared-macros.mk
@@ -44,10 +44,6 @@
 
 PKG_PROTO_DIRS += $(COMPONENT_SRC)/doc/man/man3
 COMPILER =	gcc
-# Parfait doesn't work with the GNU 4.7 compilers yet.
-ifeq   ($(strip $(PARFAIT_BUILD)),yes)
-COMPILER =	gcc3
-endif
 CFLAGS += -g -fPIC
 CONFIGURE_OPTIONS  +=		CFLAGS="$(CFLAGS)"
 CONFIGURE_OPTIONS.32 += --srcdir=$(BUILD_DIR_32)
--- a/components/nmap/Makefile	Fri Jan 17 10:38:31 2014 -0800
+++ b/components/nmap/Makefile	Fri Jan 17 11:50:07 2014 -0800
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
 #
 
 include ../../make-rules/shared-macros.mk
@@ -42,9 +42,6 @@
 # Can't use the Studio compilers as they don't support the GNU 
 # __attribute__ extension
 COMPILER =	gcc
-ifeq   ($(strip $(PARFAIT_BUILD)),yes)
-COMPILER =	gcc3
-endif
 
 COMPONENT_PRE_CONFIGURE_ACTION = \
 	($(CLONEY) $(SOURCE_DIR) $(@D))
--- a/components/openscap/Makefile	Fri Jan 17 10:38:31 2014 -0800
+++ b/components/openscap/Makefile	Fri Jan 17 11:50:07 2014 -0800
@@ -19,7 +19,7 @@
 # CDDL HEADER END
 
 #
-# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
 #
 
 include ../../make-rules/shared-macros.mk
@@ -35,10 +35,6 @@
 COMPONENT_BUGDB=        utility/openscap
 
 COMPILER =		gcc
-# Parfait doesn't work with the GNU 4.7 compilers yet.
-ifeq   ($(strip $(PARFAIT_BUILD)),yes)
-COMPILER =		gcc3
-endif
 CFLAGS+=		-std=c99
 CFLAGS+=		-DNDEBUG
 
--- a/components/openusb/Makefile	Fri Jan 17 10:38:31 2014 -0800
+++ b/components/openusb/Makefile	Fri Jan 17 11:50:07 2014 -0800
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
 #
 include ../../make-rules/shared-macros.mk
 
@@ -43,10 +43,6 @@
         ($(CLONEY) $(SOURCE_DIR) $(@D))
 
 COMPILER =	gcc
-# Parfait doesn't work with the GNU 4.7 compilers yet.
-ifeq   ($(strip $(PARFAIT_BUILD)),yes)
-COMPILER =	gcc3
-endif
 
 PATCH_LEVEL = 1
 
--- a/components/python/greenlet/Makefile	Fri Jan 17 10:38:31 2014 -0800
+++ b/components/python/greenlet/Makefile	Fri Jan 17 11:50:07 2014 -0800
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
 #
 include ../../../make-rules/shared-macros.mk
 
@@ -40,10 +40,6 @@
 
 COMPILER =	gcc
 CC =		$(COMPONENT_DIR)/CC.sh
-# Parfait doesn't work with the GNU 4.7 compilers yet.
-ifeq   ($(strip $(PARFAIT_BUILD)),yes)
-COMPILER =	gcc3
-endif
 
 COMPONENT_PRE_BUILD_ACTION = \
 	$(MKDIR) $(SOURCE_DIR)/64
--- a/components/rsyslog/Makefile	Fri Jan 17 10:38:31 2014 -0800
+++ b/components/rsyslog/Makefile	Fri Jan 17 11:50:07 2014 -0800
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
 #
 include ../../make-rules/shared-macros.mk
 
@@ -36,10 +36,6 @@
 include ../../make-rules/ips.mk
 
 COMPILER =	gcc
-# Parfait doesn't work with the GNU 4.7 compilers yet.
-ifeq   ($(strip $(PARFAIT_BUILD)),yes)
-COMPILER =	gcc3
-endif
 
 # This is needed for things to be built correctly.
 CONFIGURE_ENV +=	CFLAGS="$(CFLAGS)"
--- a/components/samba/samba/Makefile	Fri Jan 17 10:38:31 2014 -0800
+++ b/components/samba/samba/Makefile	Fri Jan 17 11:50:07 2014 -0800
@@ -53,10 +53,6 @@
 COMPILER = studio
 else
 COMPILER =	gcc
-# Parfait doesn't work with the GNU 4.7 compilers yet.
-ifeq   ($(strip $(PARFAIT_BUILD)),yes)
-COMPILER =      gcc3
-endif
 endif
 
 include ../../../make-rules/prep.mk
--- a/components/squid/Makefile	Fri Jan 17 10:38:31 2014 -0800
+++ b/components/squid/Makefile	Fri Jan 17 11:50:07 2014 -0800
@@ -42,10 +42,6 @@
 include ../../make-rules/ips.mk
 
 COMPILER =	gcc
-# Parfait doesn't work with the GNU 4.7 compilers yet.
-ifeq   ($(strip $(PARFAIT_BUILD)),yes)
-COMPILER =      gcc3
-endif
 
 CXX += $(CC_BITS)
 
--- a/components/webalizer/Makefile	Fri Jan 17 10:38:31 2014 -0800
+++ b/components/webalizer/Makefile	Fri Jan 17 11:50:07 2014 -0800
@@ -49,10 +49,6 @@
 		$(SOURCE_DIR)/sample.conf
 
 COMPILER =	gcc
-# Parfait doesn't work with the GNU 4.7 compilers yet.
-ifeq   ($(strip $(PARFAIT_BUILD)),yes)
-COMPILER =	gcc3
-endif
 
 CONFIGURE_OPTIONS +=	--enable-dns
 CONFIGURE_OPTIONS +=	--with-gd=/usr/include/gd2
--- a/tools/Makefile	Fri Jan 17 10:38:31 2014 -0800
+++ b/tools/Makefile	Fri Jan 17 11:50:07 2014 -0800
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
 #
 
 include ../make-rules/shared-macros.mk
@@ -30,6 +30,9 @@
 # with the correct compiler variables from the common makefiles because
 # some things reset the environment which causes lovely infinite
 # loops
+#
+# currently, parfait doesn't support gcc4.7+, so we force the use
+# of gcc3 in both sets of wrappers.
 links:
 	@$(MKDIR) $(PARFAIT_TOOLS)
 	@for i in cc CC gcc g++ ld ; do \
@@ -38,8 +41,8 @@
 		echo "IFS=" >> $(PARFAIT_TOOLS)/$$i ; \
 		echo "export PARFAIT_NATIVESUNCC=$(SPRO_VROOT)/bin/cc" >> $(PARFAIT_TOOLS)/$$i ; \
 		echo "export PARFAIT_NATIVESUNCXX=$(SPRO_VROOT)/bin/CC" >> $(PARFAIT_TOOLS)/$$i ; \
-		echo "export PARFAIT_NATIVEGCC=$(GCC_ROOT)/bin/gcc" >> $(PARFAIT_TOOLS)/$$i ; \
-		echo "export PARFAIT_NATIVEGXX=$(GCC_ROOT)/bin/g++" >> $(PARFAIT_TOOLS)/$$i ; \
+		echo "export PARFAIT_NATIVEGCC=$(GCC3_ROOT)/bin/gcc" >> $(PARFAIT_TOOLS)/$$i ; \
+		echo "export PARFAIT_NATIVEGXX=$(GCC3_ROOT)/bin/g++" >> $(PARFAIT_TOOLS)/$$i ; \
 		echo "export PARFAIT_NATIVELD=/usr/bin/ld" >> $(PARFAIT_TOOLS)/$$i ; \
 		echo "exec" $(PARFAIT_ROOT)/$(MACH)/parfait-$$i '$$*' >> $(PARFAIT_TOOLS)/$$i ; \
 		chmod +x $(PARFAIT_TOOLS)/$$i ; \
upstream/oracle/userland-gate