[Gsrc-commit] /srv/bzr/gsrc/trunk r1012: clean up gcc

[Brandon Invergo]

------------------------------------------------------------
revno: 1012
committer: Brandon Invergo <address@hidden>
branch nick: trunk
timestamp: Sun 2012-10-28 23:43:11 +0100
message:
  clean up gcc
added:
  gnu/gcc/config.mk
modified:
  gnu/gcc/Makefile

=== modified file 'gnu/gcc/Makefile'
--- a/gnu/gcc/Makefile  2012-10-03 19:04:16 +0000
+++ b/gnu/gcc/Makefile  2012-10-28 22:43:11 +0000
@@ -1,46 +1,37 @@
 GARNAME = gcc
 GARVERSION = 4.7.2
+HOME_URL = http://gcc.gnu.org/
+DESCRIPTION = GNU Compiler Collection
+
+######################################################################
 
 MASTER_SITES = $(MASTER_GNU)
-MASTER_SUBDIR = gcc/gcc-$(GARVERSION)/
-
+MASTER_SUBDIR = $(GARNAME)/$(DISTNAME)/
 DISTFILES = $(DISTNAME).tar.gz
 SIGFILES = $(DISTNAME).tar.gz.sig
-
 WORKOBJ = $(WORKDIR)/build
+INSTALL_SCRIPTS = $(WORKOBJ)/Makefile links
+
 BUILDDEPS = gmp mpfr mpc
-TESTDEPS = autogen
 LIBDEPS = zlib
-USE_TESTS = # these take ages
-#CONFIGURE_OPTS = --with-local-prefix=$(prefix) --with-mpfr=$(prefix) 
--with-gmp=$(prefix) --with-mpc=$(prefix) --enable-languages=c,c++,fortran,objc
 
-HOME_URL = http://gcc.gnu.org/
-DESCRIPTION = GNU Compiler Collection
+######################################################################
 
 include ../../gar.lib/auto.mk
+include config.mk
 
-CONFIGURE_OPTS = \
-                --enable-__cxa_atexit \
-                --enable-threads=posix \
-                --enable-shared \
-                --enable-languages=c,c++ \
-                --enable-clocale=gnu \
-                --enable-cloog-backend=isl \
-                --disable-bootstrap \
-                --disable-multilib \
+CONFIGURE_ARGS += \
                 --with-local-prefix=$(prefix) \
                 --with-mpfr=$(prefix) \
                 --with-gmp=$(prefix) \
                 --with-mpc=$(prefix) \
                 --with-system-zlib
-                #$(if $(filter %-amd64,$(GARARCH)),--with-multilib-list=)
 
-BUILD_OPTS = \
-                profiledbootstrap
+CPPFLAGS += -I$(prefix)/include
 
 install-links: 
        @ln -sf gcc $(packageprefix)/bin/cc
        @ln -sf ../bin/cpp $(packageprefix)/lib/cpp
        $(MAKECOOKIE)
 
-CPPFLAGS += -I$(prefix)/include
+

=== added file 'gnu/gcc/config.mk'
--- a/gnu/gcc/config.mk 1970-01-01 00:00:00 +0000
+++ b/gnu/gcc/config.mk 2012-10-28 22:43:11 +0000
@@ -0,0 +1,17 @@
+## Configuration options for gcc ##
+
+## Note: you must set up your environment (PATH, LDPATH, etc) to
+## include GSRC-installed packages in order to install gcc as
+## configured below. You can do this easily like so in Bash:
+## $ source $(your_gsrc_dir) setup.sh
+
+CONFIGURE_OPTS ?= --enable-__cxa_atexit \
+                 --enable-threads=posix \
+                 --enable-shared \
+                 --enable-languages=c,c++ \
+                 --enable-clocale=gnu \
+                 --enable-cloog-backend=isl \
+                 --disable-bootstrap \
+                 --disable-multilib \
+
+BUILD_OPTS ?=