--- a/components/acpidump/Makefile Wed Oct 02 01:03:26 2013 -0700
+++ b/components/acpidump/Makefile Fri Oct 04 10:19:05 2013 -0700
@@ -20,7 +20,7 @@
#
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
include ../../make-rules/shared-macros.mk
@@ -48,7 +48,7 @@
PKG_PROTO_DIRS += $(BUILD_DIR_32)
-COMPILER = gcc
+COMPILER = gcc3
COMPONENT_BUILD_ENV += CC=$(CC)
--- a/components/autogen/Makefile Wed Oct 02 01:03:26 2013 -0700
+++ b/components/autogen/Makefile Fri Oct 04 10:19:05 2013 -0700
@@ -40,7 +40,7 @@
COMPONENT_PRE_CONFIGURE_ACTION = ($(CLONEY) $(SOURCE_DIR) $(@D))
# built in SFW with gcc and builds cleanly now only with gcc
-COMPILER = gcc
+COMPILER = gcc3
CONFIGURE_OPTIONS += CFLAGS="$(CFLAGS)"
# strip the environment or install target fails
--- a/components/bcc/Makefile Wed Oct 02 01:03:26 2013 -0700
+++ b/components/bcc/Makefile Fri Oct 04 10:19:05 2013 -0700
@@ -20,7 +20,7 @@
#
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
include ../../make-rules/shared-macros.mk
@@ -39,7 +39,7 @@
include ../../make-rules/justmake.mk
include ../../make-rules/ips.mk
-COMPILER=gcc
+COMPILER=gcc3
COMPONENT_PRE_CONFIGURE_ACTION = ($(CLONEY) $(SOURCE_DIR) $(@D))
--- a/components/clisp/Makefile Wed Oct 02 01:03:26 2013 -0700
+++ b/components/clisp/Makefile Fri Oct 04 10:19:05 2013 -0700
@@ -46,7 +46,7 @@
COMPONENT_PRE_CONFIGURE_ACTION = \
($(CLONEY) $(SOURCE_DIR) $(@D))
-COMPILER= gcc
+COMPILER= gcc3
PATCH_LEVEL= 0
# SHELLOPTS appears to cause clisp's configure script to fail while
--- a/components/emacs/Makefile Wed Oct 02 01:03:26 2013 -0700
+++ b/components/emacs/Makefile Fri Oct 04 10:19:05 2013 -0700
@@ -62,7 +62,7 @@
# configure script has problems using a non-GNU cpp. I am not aware of
# any reason Sun Studio could not be made to work, but simply made a
# cost/benefit decision not to pursue it at this time
-COMPILER = gcc
+COMPILER = gcc3
# Uncomment this for debugging only. It configures emacs to run from the
# local proto instead of from its final installed location.
--- a/components/erlang/Makefile Wed Oct 02 01:03:26 2013 -0700
+++ b/components/erlang/Makefile Fri Oct 04 10:19:05 2013 -0700
@@ -70,7 +70,7 @@
IPS_COMPONENT_VERSION= $(COMPONENT_VERSION_MAJOR).2.3
# Built in SFW with gcc and builds cleanly now only with gcc
-COMPILER = gcc
+COMPILER = gcc3
CONFIGURE_OPTIONS += CFLAGS="$(CFLAGS)"
CONFIGURE_OPTIONS += CPPFLAGS="$(CPPFLAGS) -I/usr/include/gd2"
--- a/components/gcc3/Makefile Wed Oct 02 01:03:26 2013 -0700
+++ b/components/gcc3/Makefile Fri Oct 04 10:19:05 2013 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
include ../../make-rules/shared-macros.mk
@@ -43,7 +43,7 @@
PKG_MACROS += GNU_ARCH="$(GNU_ARCH)"
# we build gcc with gcc
-COMPILER = gcc
+COMPILER = gcc3
# CC_BITS may get in the way
CC_BITS=
--- a/components/guile/Makefile Wed Oct 02 01:03:26 2013 -0700
+++ b/components/guile/Makefile Fri Oct 04 10:19:05 2013 -0700
@@ -37,7 +37,7 @@
include ../../make-rules/ips.mk
# Built in SFW with gcc and builds cleanly now only with gcc
-COMPILER = gcc
+COMPILER = gcc3
CONFIGURE_OPTIONS += CPPFLAGS="-I/usr/include/gmp -D__USE_LEGACY_PROTOTYPES__"
CONFIGURE_OPTIONS += --disable-static
CONFIGURE_OPTIONS += --disable-error-on-warning
--- a/components/jsl/Makefile Wed Oct 02 01:03:26 2013 -0700
+++ b/components/jsl/Makefile Fri Oct 04 10:19:05 2013 -0700
@@ -39,7 +39,7 @@
# Preferred compiler set to gcc and not Studio as on Sparc architecture
# some assembler code is required for locking which fails to compile on
# solaris, when using gcc this is inlined (see jslock.c)
-COMPILER= gcc
+COMPILER= gcc3
COMPONENT_BUILD_ARGS += -f src/Makefile
COMPONENT_BUILD_ARGS += CC="$(CC)"
--- a/components/libnet/Makefile Wed Oct 02 01:03:26 2013 -0700
+++ b/components/libnet/Makefile Fri Oct 04 10:19:05 2013 -0700
@@ -43,7 +43,7 @@
($(CLONEY) $(SOURCE_DIR) $(@D))
PKG_PROTO_DIRS += $(COMPONENT_SRC)/doc/man/man3
-COMPILER= gcc
+COMPILER= gcc3
CFLAGS += -g -fPIC
CONFIGURE_OPTIONS += CFLAGS="$(CFLAGS)"
CONFIGURE_OPTIONS.32 += --srcdir=$(BUILD_DIR_32)
--- a/components/nmap/Makefile Wed Oct 02 01:03:26 2013 -0700
+++ b/components/nmap/Makefile Fri Oct 04 10:19:05 2013 -0700
@@ -42,8 +42,9 @@
# Can't use the Studio compilers as they don't support the GNU
# __attribute__ extension
COMPILER = gcc
-CC = /usr/gcc/4.7/bin/gcc
-CXX = /usr/gcc/4.7/bin/g++
+ifeq ($(strip $(PARFAIT_BUILD)),yes)
+COMPILER = gcc3
+endif
COMPONENT_PRE_CONFIGURE_ACTION = \
($(CLONEY) $(SOURCE_DIR) $(@D))
--- a/components/open-fabrics/Makefile Wed Oct 02 01:03:26 2013 -0700
+++ b/components/open-fabrics/Makefile Fri Oct 04 10:19:05 2013 -0700
@@ -48,6 +48,7 @@
clean: TARGET = clean
clobber: TARGET = clobber
test: TARGET = test
+parfait: TARGET = parfait
build: install
@@ -55,6 +56,9 @@
download prep install test: $(SUBDIRS)
+parfait:
+ $(MAKE) PARFAIT_BUILD=yes install
+
clean: $(SUBDIRS)
$(RM) -r prototype build
--- a/components/open-fabrics/ofed.mk Wed Oct 02 01:03:26 2013 -0700
+++ b/components/open-fabrics/ofed.mk Fri Oct 04 10:19:05 2013 -0700
@@ -27,11 +27,11 @@
PROTO_DIR = $(WS_COMPONENTS)/open-fabrics/prototype/$(MACH)
# OFED only builds with GCC
-COMPILER=gcc
+COMPILER=gcc3
-PATH=/usr/sfw/bin:/usr/bin:/usr/gnu/bin
+PATH=$(GCC3_ROOT)/bin:/usr/bin:/usr/gnu/bin
ifeq ($(strip $(PARFAIT_BUILD)),yes)
-PATH=$(PARFAIT_TOOLS):/usr/sfw/bin:/usr/bin
+PATH=$(PARFAIT_TOOLS_GCC3):$(GCC3_ROOT)/bin:/usr/bin
endif
--- a/components/openscap/Makefile Wed Oct 02 01:03:26 2013 -0700
+++ b/components/openscap/Makefile Fri Oct 04 10:19:05 2013 -0700
@@ -34,7 +34,7 @@
COMPONENT_ARCHIVE_URL= $(COMPONENT_DOWNLOAD_URL)/$(COMPONENT_ARCHIVE)
COMPONENT_BUGDB= utility/openscap
-COMPILER= gcc
+COMPILER= gcc3
CFLAGS+= -std=c99
CFLAGS+= -DNDEBUG
--- a/components/openusb/Makefile Wed Oct 02 01:03:26 2013 -0700
+++ b/components/openusb/Makefile Fri Oct 04 10:19:05 2013 -0700
@@ -42,7 +42,7 @@
COMPONENT_PRE_CONFIGURE_ACTION = \
($(CLONEY) $(SOURCE_DIR) $(@D))
-COMPILER = gcc
+COMPILER = gcc3
PATCH_LEVEL = 1
--- a/components/python/greenlet/Makefile Wed Oct 02 01:03:26 2013 -0700
+++ b/components/python/greenlet/Makefile Fri Oct 04 10:19:05 2013 -0700
@@ -38,7 +38,7 @@
ASLR_MODE = $(ASLR_NOT_APPLICABLE)
-COMPILER = gcc
+COMPILER = gcc3
gcc_OPT = -O2
COMPONENT_PRE_BUILD_ACTION = \
--- a/components/rsyslog/Makefile Wed Oct 02 01:03:26 2013 -0700
+++ b/components/rsyslog/Makefile Fri Oct 04 10:19:05 2013 -0700
@@ -35,7 +35,7 @@
include ../../make-rules/configure.mk
include ../../make-rules/ips.mk
-COMPILER = gcc
+COMPILER = gcc3
# This is needed for things to be built correctly.
CONFIGURE_ENV += CFLAGS="$(CFLAGS)"
--- a/components/samba/samba/Makefile Wed Oct 02 01:03:26 2013 -0700
+++ b/components/samba/samba/Makefile Fri Oct 04 10:19:05 2013 -0700
@@ -52,7 +52,7 @@
ifeq ($(MACH), sparc)
COMPILER = studio
else
-COMPILER = gcc
+COMPILER = gcc3
endif
include ../../../make-rules/prep.mk
@@ -118,7 +118,7 @@
cd $(BUILD_DIR) ; $(UNPACK) $(UNPACK_ARGS) ../$(COMPONENT_ARCHIVE_2)
CFLAGS.studio += $(studio_C99_ENABLE)
-CFLAGS.gcc += -std=c99
+CFLAGS.gcc3 += -std=c99
#CPPFLAGS += -DSAMBA_VERSION_VENDOR_SUFFIX=\\\"Placeholder_for_vendor_suffix\\\"
CPPFLAGS += $(CPP_LARGEFILES)
--- a/components/squid/Makefile Wed Oct 02 01:03:26 2013 -0700
+++ b/components/squid/Makefile Fri Oct 04 10:19:05 2013 -0700
@@ -41,7 +41,7 @@
include ../../make-rules/configure.mk
include ../../make-rules/ips.mk
-COMPILER = gcc
+COMPILER = gcc3
CFLAGS += -I/usr/include/kerberosv5
CFLAGS += $(CPP_LARGEFILES)
--- a/components/webalizer/Makefile Wed Oct 02 01:03:26 2013 -0700
+++ b/components/webalizer/Makefile Fri Oct 04 10:19:05 2013 -0700
@@ -48,7 +48,7 @@
$(GSED) -i -e 's?lib/httpd/logs/?apache2/2.2/logs/?' \
$(SOURCE_DIR)/sample.conf
-COMPILER = gcc
+COMPILER = gcc3
CONFIGURE_OPTIONS += --enable-dns
CONFIGURE_OPTIONS += --with-gd=/usr/include/gd2
--- a/make-rules/shared-macros.mk Wed Oct 02 01:03:26 2013 -0700
+++ b/make-rules/shared-macros.mk Fri Oct 04 10:19:05 2013 -0700
@@ -227,13 +227,15 @@
PARFAIT_ROOT = $(BUILD_TOOLS)/parfait/parfait-tools-1.2.0.2
PARFAIT_TOOLS= $(WS_TOOLS)/$(MACH)/parfait
+PARFAIT_TOOLS_GCC3= $(PARFAIT_TOOLS)/gcc3
PARFAIT= $(PARFAIT_ROOT)/bin/parfait
export PARFAIT_NATIVESUNCC=$(SPRO_VROOT)/bin/cc
export PARFAIT_NATIVESUNCXX=$(SPRO_VROOT)/bin/CC
export PARFAIT_NATIVEGCC=$(GCC_ROOT)/bin/gcc
export PARFAIT_NATIVEGXX=$(GCC_ROOT)/bin/g++
-GCC_ROOT = /usr/sfw
+GCC_ROOT = /usr/gcc/4.7
+GCC3_ROOT = /usr/gcc/3.4
CC.studio.32 = $(SPRO_VROOT)/bin/cc
CXX.studio.32 = $(SPRO_VROOT)/bin/CC
@@ -248,6 +250,11 @@
CC.gcc.64 = $(GCC_ROOT)/bin/gcc
CXX.gcc.64 = $(GCC_ROOT)/bin/g++
+CC.gcc3.32 = $(GCC3_ROOT)/bin/gcc
+CXX.gcc3.32 = $(GCC3_ROOT)/bin/g++
+
+CC.gcc3.64 = $(GCC3_ROOT)/bin/gcc
+CXX.gcc3.64 = $(GCC3_ROOT)/bin/g++
lint.32 = $(SPRO_VROOT)/bin/lint -m32
lint.64 = $(SPRO_VROOT)/bin/lint -m64
@@ -273,6 +280,10 @@
CXX.gcc.32 = $(PARFAIT_TOOLS)/g++
CC.gcc.64 = $(PARFAIT_TOOLS)/gcc
CXX.gcc.64 = $(PARFAIT_TOOLS)/g++
+CC.gcc3.32 = $(PARFAIT_TOOLS_GCC3)/gcc
+CXX.gcc3.32 = $(PARFAIT_TOOLS_GCC3)/g++
+CC.gcc3.64 = $(PARFAIT_TOOLS_GCC3)/gcc
+CXX.gcc3.64 = $(PARFAIT_TOOLS_GCC3)/g++
LD = $(PARFAIT_TOOLS)/ld
endif
@@ -555,6 +566,8 @@
# configure environment.
CFLAGS.gcc += $(gcc_OPT)
CFLAGS.gcc += $(gcc_XREGS)
+CFLAGS.gcc3 += $(gcc_OPT)
+CFLAGS.gcc3 += $(gcc_XREGS)
# Build 32 or 64 bit objects.
--- a/tools/Makefile Wed Oct 02 01:03:26 2013 -0700
+++ b/tools/Makefile Fri Oct 04 10:19:05 2013 -0700
@@ -33,7 +33,6 @@
links:
@$(MKDIR) $(PARFAIT_TOOLS)
@for i in cc CC gcc g++ ld ; do \
- $(MKDIR) $(PARFAIT_TOOLS) ; \
$(RM) $(PARFAIT_TOOLS)/$$i ; \
echo "#!/bin/ksh" > $(PARFAIT_TOOLS)/$$i ; \
echo "IFS=" >> $(PARFAIT_TOOLS)/$$i ; \
@@ -45,6 +44,14 @@
echo "exec" $(PARFAIT_ROOT)/$(MACH)/parfait-$$i '$$*' >> $(PARFAIT_TOOLS)/$$i ; \
chmod +x $(PARFAIT_TOOLS)/$$i ; \
done
+ @$(MKDIR) $(PARFAIT_TOOLS_GCC3)
+ @for i in cc CC gcc g++ ld ; do \
+ $(RM) $(PARFAIT_TOOLS_GCC3)/$$i ; \
+ sed \
+ -e "s,$(GCC_ROOT),$(GCC3_ROOT)," < $(PARFAIT_TOOLS)/$$i \
+ > $(PARFAIT_TOOLS_GCC3)/$$i ; \
+ chmod +x $(PARFAIT_TOOLS_GCC3)/$$i ; \
+ done
pkglint:
@rm -f pkglint
@@ -69,5 +76,5 @@
clobber: clean
@$(RM) time-*.so python/pkglint/*.pyc
- @$(RM) -r $(PARFAIT_TOOLS)
+ @$(RM) -r $(PARFAIT_TOOLS) $(PARFAIT_TOOLS_GCC3) $(MACH)