From f2288f500a1fa00d37058e1affee7119fa064ae3 Mon Sep 17 00:00:00 2001 From: Sascha Wildner Date: Sun, 10 Sep 2006 20:53:21 +0000 Subject: [PATCH] Update default make.conf and its manpage: * Sync CPU types with share/mk/bsd.cpu.gcc{34,40}.mk. * Add some generic words of warning about building with the experimental compiler. * Add NO_GDB and WANT_LUKEMFTPD. * Remove duplicate NO_SHARE. * Remove ports specific FETCH_ENV. Based-on-patch-by: Trevor Kendall Thanks to pavalos for noting that WANT_LUKEMFTPD is missing. --- etc/defaults/make.conf | 24 ++++++++++-------------- share/man/man5/make.conf.5 | 17 +++++------------ 2 files changed, 15 insertions(+), 26 deletions(-) diff --git a/etc/defaults/make.conf b/etc/defaults/make.conf index c99ccda9b3..97f725af4e 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.17 2006/07/02 16:03:42 swildner Exp $ +# $DragonFly: src/etc/defaults/make.conf,v 1.18 2006/09/10 20:53:21 swildner Exp $ # # NOTE: Please would any committer updating this file also update the # make.conf(5) manual page, if necessary, which is located in @@ -22,8 +22,8 @@ # NO_CPU_CFLAGS variable below. # Currently the following CPU types are recognized: # Intel x86 architecture: -# (AMD CPUs) k7 k6-2 k6 k5 -# (Intel CPUs) p4 p3 p2 i686 i586/mmx i586 i486 i386 +# (AMD CPUs) opteron athlon-fx athlon64 k8 k7 k6-3 k6-2 k6 k5 +# (Intel CPUs) p4 p3 p2 i686 i586/mmx i586 i486 # # If you experience any problems after setting this flag, please unset # it again before submitting a bug report or attempting to modify code. @@ -37,9 +37,9 @@ # # The CCVER variable controls which GCC-version to use by default. It # should be set using ?= so as not to interfere with CCVER overrides from -# userland or the buildworld. We currently recommend that an override NOT -# be set in /etc/make.conf and that gcc 3.4 not yet be used to build the boot -# blocks, boot loader, or the kernel. +# userland or the buildworld. Note that building world or the kernel using +# the experimental compiler might be broken at any time. We currently +# recommend that an override NOT be set in /etc/make.conf. # #CCVER?=gcc34 # (use GCC 3.4, default) #CCVER?=gcc40 # (use GCC 4.0, experimental, must define WANT_GCC40) @@ -104,6 +104,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_GDB= true # do not build GDB #NO_I4B= true # do not build isdn4bsd package #NO_IPFILTER= true # do not build IP Filter package #NO_LIBC_R= true # do not build libc_r (re-entrant version of libc) @@ -122,7 +123,6 @@ BDECFLAGS= -W -Wall -ansi -pedantic -Wbad-function-cast -Wcast-align \ #NOMAN= true # do not build manual pages #NOMANCOMPRESS= true # do not compress man pages #NOPROFILE= true # Avoid compiling profiled libraries -#NO_SHARE= true # do not go into the share subdir # # To build sys/modules when building the world (our old way of doing things) #MODULES_WITH_WORLD=true # do not build modules when building kernel @@ -172,13 +172,6 @@ BDECFLAGS= -W -Wall -ansi -pedantic -Wbad-function-cast -Wcast-align \ # #LOADER_TFTP_SUPPORT= YES # -# If you're behind a firewall and need FTP or HTTP proxy services for -# ports collection fetching to work, the following examples give the -# necessary syntax. See the fetch(3) man page for details. -# -#FETCH_ENV= FTP_PROXY=ftp://10.0.0.1:21 -#FETCH_ENV= HTTP_PROXY=http://10.0.0.1:80 -# # If you want Kerberos 5, define this. #WANT_KERBEROS= yes # @@ -190,6 +183,9 @@ BDECFLAGS= -W -Wall -ansi -pedantic -Wbad-function-cast -Wcast-align \ # file(s) you use on your site (see /usr/share/examples/cvsup/README for more # information on CVSup and these files). To use, do "make update" in /usr/src. # +# To enable building of lukemftpd, define this. +#WANT_LUKEMFTPD= yes +# #SUP_UPDATE= yes #SUP= /usr/local/bin/cvsup #SUPFLAGS= -g -L 2 diff --git a/share/man/man5/make.conf.5 b/share/man/man5/make.conf.5 index f5440221ab..40fa3c2fc2 100644 --- a/share/man/man5/make.conf.5 +++ b/share/man/man5/make.conf.5 @@ -23,9 +23,9 @@ .\" 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.14 2006/07/02 16:03:42 swildner Exp $ +.\" $DragonFly: src/share/man/man5/make.conf.5,v 1.15 2006/09/10 20:53:21 swildner Exp $ .\" -.Dd July 2, 2006 +.Dd September 10, 2006 .Dt MAKE.CONF 5 .Os .Sh NAME @@ -354,16 +354,6 @@ is defined. Set this to install .Xr ssh 1 with the setuid bit turned on. -.It Va FETCH_ENV -.Pq Vt str -If you're behind a firewall and need FTP or HTTP proxy services for -.Xr fetch 1 , -the following examples provide the necessary syntax. -.Pp -.Bd -literal -offset indent -FETCH_ENV=FTP_PROXY=ftp://10.0.0.1:21 -FETCH_ENV=FTP_PROXY=http://10.0.0.1:80 -.Ed .It Va MODULES_WITH_WORLD .Pq Vt bool Set to build modules with the system instead of the kernel. @@ -598,6 +588,9 @@ to determine if you can legally use IDEA. Set this to build Kerberos5 (KTH Heimdal). .Em WARNING ! This is still experimental code. +.It Va WANT_LUKEMFTPD +Set this to enable building of +.Xr lukemftpd 8 . .It Va WITH_BSDTAR .Pq Vt bool Set this to use -- 2.28.0