From 6414e8a03e04611a1b4b27ed3fb6f6d1c408b9d1 Mon Sep 17 00:00:00 2001 From: Peter Avalos Date: Wed, 5 Sep 2007 21:40:10 +0000 Subject: [PATCH] Add a build option (NO_GCC34) to prevent building gcc version 3.4. This does not attempt to remove gcc-3.4, only to prevent it from building. --- Makefile.inc1 | 6 +++++- etc/defaults/make.conf | 3 ++- gnu/lib/Makefile | 8 +++++--- gnu/usr.bin/Makefile | 5 ++++- share/man/man5/make.conf.5 | 5 ++++- 5 files changed, 20 insertions(+), 7 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 6f1c276540..b687ef1155 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1,6 +1,6 @@ # # $FreeBSD: src/Makefile.inc1,v 1.141.2.62 2003/04/06 19:54:00 dwmalone Exp $ -# $DragonFly: src/Makefile.inc1,v 1.107 2007/08/23 07:00:31 corecode Exp $ +# $DragonFly: src/Makefile.inc1,v 1.108 2007/09/05 21:40:10 pavalos Exp $ # # Build-time options are documented in make.conf(5). # @@ -820,8 +820,10 @@ bootstrap-tools: _share= share/syscons/scrnmaps .endif +.if !defined(NO_GCC34) _gcc34_cross= gnu/usr.bin/cc34 _gcc34_tools= gnu/usr.bin/cc34/cc_prep gnu/usr.bin/cc34/cc_tools +.endif _gcc41_cross= gnu/usr.bin/cc41 _gcc41_tools= gnu/usr.bin/cc41/cc_prep gnu/usr.bin/cc41/cc_tools _binutils= gnu/usr.bin/binutils217 @@ -884,9 +886,11 @@ hierarchy: # to specify the correct CCVER or 'cc' will not exec the correct compiler. # libraries: +.if !defined(NO_GCC34) cd ${.CURDIR}; \ HOST_CCVER=${HOST_CCVER} CCVER=gcc34 \ ${MAKE} -f Makefile.inc1 _startup_libs34; +.endif cd ${.CURDIR}; \ HOST_CCVER=${HOST_CCVER} CCVER=gcc41 \ ${MAKE} -f Makefile.inc1 _startup_libs41; diff --git a/etc/defaults/make.conf b/etc/defaults/make.conf index 7579dfca64..a7c421ad49 100644 --- a/etc/defaults/make.conf +++ b/etc/defaults/make.conf @@ -1,5 +1,5 @@ # $FreeBSD: src/etc/defaults/make.conf,v 1.97.2.80 2003/02/15 16:34:56 trhodes Exp $ -# $DragonFly: src/etc/defaults/make.conf,v 1.29 2007/08/09 22:50:37 corecode Exp $ +# $DragonFly: src/etc/defaults/make.conf,v 1.30 2007/09/05 21:40:10 pavalos Exp $ # # NOTE: Please would any committer updating this file also update the # make.conf(5) manual page, if necessary, which is located in @@ -98,6 +98,7 @@ BDECFLAGS= -W -Wall -ansi -pedantic -Wbad-function-cast -Wcast-align \ #NO_CVS= true # do not build CVS #NO_FORTRAN= true # do not build g77 and related libraries #NO_GAMES= true # do not enter the games subdirectory +#NO_GCC34 true # do not build gcc-3.4 #NO_GDB= true # do not build GDB #NO_I4B= true # do not build isdn4bsd package #NO_IPFILTER= true # do not build IP Filter package diff --git a/gnu/lib/Makefile b/gnu/lib/Makefile index d0a2afd09a..8d6842f229 100644 --- a/gnu/lib/Makefile +++ b/gnu/lib/Makefile @@ -1,7 +1,9 @@ # $FreeBSD: src/gnu/lib/Makefile,v 1.25.2.4 2001/01/06 23:16:53 obrien Exp $ -# $DragonFly: src/gnu/lib/Makefile,v 1.15 2007/08/09 22:50:37 corecode Exp $ +# $DragonFly: src/gnu/lib/Makefile,v 1.16 2007/09/05 21:40:10 pavalos Exp $ -SUBDIR= libdialog libregex libreadline gcc34 -SUBDIR+= gcc41 +SUBDIR= libdialog libregex libreadline gcc41 +.if !defined(NO_GCC34) +SUBDIR+= gcc34 +.endif .include diff --git a/gnu/usr.bin/Makefile b/gnu/usr.bin/Makefile index d995bcdd0c..d452f7e66b 100644 --- a/gnu/usr.bin/Makefile +++ b/gnu/usr.bin/Makefile @@ -1,5 +1,5 @@ # $FreeBSD: src/gnu/usr.bin/Makefile,v 1.51 2000/01/16 00:11:34 obrien Exp $ -# $DragonFly: src/gnu/usr.bin/Makefile,v 1.31 2007/08/09 22:50:37 corecode Exp $ +# $DragonFly: src/gnu/usr.bin/Makefile,v 1.32 2007/09/05 21:40:10 pavalos Exp $ SUBDIR= cpio dialog diff diff3 grep groff man rcs sdiff sort texinfo @@ -12,8 +12,11 @@ SUBDIR+=gdb .endif SUBDIR+= binutils217 + +.if !defined(NO_GCC34) SUBDIR+= cc34 .ORDER: binutils217 cc34 +.endif SUBDIR+= cc41 .ORDER: binutils217 cc41 diff --git a/share/man/man5/make.conf.5 b/share/man/man5/make.conf.5 index 4315986cdb..81222ca15e 100644 --- a/share/man/man5/make.conf.5 +++ b/share/man/man5/make.conf.5 @@ -23,7 +23,7 @@ .\" SUCH DAMAGE. .\" .\" $FreeBSD: src/share/man/man5/make.conf.5,v 1.12.2.30 2003/05/18 17:05:55 brueffer Exp $ -.\" $DragonFly: src/share/man/man5/make.conf.5,v 1.27 2007/08/09 22:50:37 corecode Exp $ +.\" $DragonFly: src/share/man/man5/make.conf.5,v 1.28 2007/09/05 21:40:10 pavalos Exp $ .\" .Dd March 23, 2007 .Dt MAKE.CONF 5 @@ -384,6 +384,9 @@ and related libraries. .It Va NO_GAMES .Pq Vt bool Set to not build games. +.It Va NO_GCC34 +.Pq Vt bool +Set to not build the older version of GCC (3.4). .It Va NO_GDB .Pq Vt bool Set to not build -- 2.41.0