[csw-devel] SF.net SVN: gar:[15335] csw/mgar/pkg/gcc4/branches/bootstrap-4.6

[wahwah at users.sourceforge.net]

Revision: 15335
          http://gar.svn.sourceforge.net/gar/?rev=15335&view=rev
Author:   wahwah
Date:     2011-08-14 20:33:23 +0000 (Sun, 14 Aug 2011)

Log Message:
-----------
pkg/gcc4/branches/bootstrap-4.6: build recipe remake, step 1

Modified Paths:
--------------
    csw/mgar/pkg/gcc4/branches/bootstrap-4.6/Makefile

Added Paths:
-----------
    csw/mgar/pkg/gcc4/branches/bootstrap-4.6/files/0001-clear-AM_CFLAGS-in-lto-plugin.patch

Modified: csw/mgar/pkg/gcc4/branches/bootstrap-4.6/Makefile
===================================================================
--- csw/mgar/pkg/gcc4/branches/bootstrap-4.6/Makefile	2011-08-14 14:05:39 UTC (rev 15334)
+++ csw/mgar/pkg/gcc4/branches/bootstrap-4.6/Makefile	2011-08-14 20:33:23 UTC (rev 15335)
@@ -12,14 +12,14 @@
 	for these languages (libstdc++, libgcj,...).
 endef
 
-DISTFILES    = $(NAME)-$(VERSION).tar.bz2
+DISTFILES    = $(DISTNAME).tar.bz2
 MASTER_SITES = $(GNU_MIRROR)/$(NAME)-$(VERSION)/
 
 PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386
 PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386
 
 # GIT init takes a long time, disable for now, reenable if build works
-NOGITPATCH ?= 1
+# NOGITPATCH ?= 1
 
 ## build options
 CONFIGURE_ARGS  = --prefix=$(BUILD_PREFIX)/gcc4
@@ -34,20 +34,40 @@
 CONFIGURE_ARGS += --with-x
 CONFIGURE_ARGS += --with-mpfr=$(BUILD_PREFIX)
 CONFIGURE_ARGS += --with-gmp=$(BUILD_PREFIX)
-CONFIGURE_ARGS += --enable-java-awt=xlib
-CONFIGURE_ARGS += --enable-libada
+# CONFIGURE_ARGS += --enable-java-awt=xlib
+# CONFIGURE_ARGS += --enable-libada
 CONFIGURE_ARGS += --enable-libssp
 CONFIGURE_ARGS += --enable-objc-gc
 CONFIGURE_ARGS += --enable-threads=posix 
 CONFIGURE_ARGS += --enable-stage1-languages=c
-CONFIGURE_ARGS += --enable-languages=ada,c,c++,fortran,java,objc
+# We'll build ada later.
+# CONFIGURE_ARGS += --enable-languages=ada,c,c++,fortran,java,objc
+CONFIGURE_ARGS += --enable-languages=c,c++,fortran,java,objc
+CONFIGURE_ARGS += --enable-bootstrap
 
-## For cleanliness I split the Configuration into separate files
-include files/gar_override.mk
-include files/package_def.mk
-include files/pkg_scripts.mk
-include files/package_files.mk
-include files/amd_merge.mk
+# Different objdir
+OBJDIR          = objdir
+
+# These flags are passed when gcc is built with gcc.
+# Needed to remove FLAVOR_FLAGS, because they were Sun Studio specific.
+CFLAGS_FOR_TARGET = -O2 $(ARCHFLAGS_GCC4_$(ISA)) $(EXTRA_GCC4_CC_FLAGS) $(EXTRA_GCC_CC_FLAGS) $(EXTRA_CC_FLAGS)
+CXXFLAGS_FOR_TARGET = -O2 $(ARCHFLAGS_GCC4_$(ISA)) $(EXTRA_GCC4_CXX_FLAGS) $(EXTRA_GCC_CXX_FLAGS) $(EXTRA_CXX_FLAGS)
+EXTRA_EXPORTS += CFLAGS_FOR_TARGET
+EXTRA_EXPORTS += CXXFLAGS_FOR_TARGET
+
+# bash must be used, otherwise:
+# http://fixunix.com/solaris/490396-gcc-build-fails-cannot-compute-suffix-object-files.html
+CONFIG_SHELL = /opt/csw/bin/bash
+EXTRA_EXPORTS += CONFIG_SHELL
+
+EXTRA_CONFIGURE_EXPORTS += CFLAGS_FOR_TARGET
+EXTRA_CONFIGURE_EXPORTS += CXXFLAGS_FOR_TARGET
+
+OBJDUMP=/opt/csw/bin/gobjdump
+EXTRA_EXPORTS += OBJDUMP
+
+PATCHFILES += 0001-clear-AM_CFLAGS-in-lto-plugin.patch
+
 include gar/category.mk
 
 # We need GNU find as find

Added: csw/mgar/pkg/gcc4/branches/bootstrap-4.6/files/0001-clear-AM_CFLAGS-in-lto-plugin.patch
===================================================================
--- csw/mgar/pkg/gcc4/branches/bootstrap-4.6/files/0001-clear-AM_CFLAGS-in-lto-plugin.patch	                        (rev 0)
+++ csw/mgar/pkg/gcc4/branches/bootstrap-4.6/files/0001-clear-AM_CFLAGS-in-lto-plugin.patch	2011-08-14 20:33:23 UTC (rev 15335)
@@ -0,0 +1,29 @@
+From b648830934c1b709ee5b02a41c5a579ef4306c0d Mon Sep 17 00:00:00 2001
+From: Maciej Blizinski <maciej at opencsw.org>
+Date: Sun, 14 Aug 2011 21:23:14 +0200
+Subject: [PATCH] clear AM_CFLAGS in lto-plugin
+
+---
+ lto-plugin/Makefile.in |    6 +++++-
+ 1 files changed, 5 insertions(+), 1 deletions(-)
+
+diff --git a/lto-plugin/Makefile.in b/lto-plugin/Makefile.in
+index 86edb99..704d182 100644
+--- a/lto-plugin/Makefile.in
++++ b/lto-plugin/Makefile.in
+@@ -227,7 +227,11 @@ AUTOMAKE_OPTIONS = no-dependencies
+ gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER)
+ libexecsubdir := $(libexecdir)/gcc/$(target_noncanonical)/$(gcc_version)
+ AM_CPPFLAGS = -I$(top_srcdir)/../include $(DEFS)
+-AM_CFLAGS = -Wall -Werror
++# AM_CFLAGS = -Wall -Werror
++# The above AM_CFLAGS were breaking the bootstrap with Sun Studio, because
++# they were passed unconditionally to the compiler, which doesn't support
++# -Wall nor -Werror.
++AM_CFLAGS =
+ AM_LIBTOOLFLAGS = --tag=disable-static
+ libexecsub_LTLIBRARIES = liblto_plugin.la
+ gcc_build_dir = ../$(host_subdir)/gcc
+-- 
+1.7.6
+


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.