Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 05 Nov 2000 23:49:24 +0900
From:      "Akinori MUSHA" <knu@idaemons.org>
To:        FreeBSD-gnats-submit@freebsd.org
Subject:   conf/22622: make.conf includes both "optimisation" and "optimization" spellings
Message-ID:  <86zojetqx7.wl@archon.local.idaemons.org>

next in thread | raw e-mail | index | archive | help

>Number:         22622
>Category:       conf
>Synopsis:       make.conf includes both "optimisation" and "optimization" spellings
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          doc-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sun Nov 05 06:50:06 PST 2000
>Closed-Date:
>Last-Modified:
>Originator:     "Akinori MUSHA" <knu@idaemons.org>
>Release:        FreeBSD 5.0-CURRENT i386
>Organization:
Associated I. Daemons
>Environment:

  FreeBSD archon.local.idaemons.org 5.0-CURRENT FreeBSD 5.0-CURRENT #27: Sat Nov  4 21:02:37 JST 2000     root@archon.local.idaemons.org:/usr/local/src/sys/compile/ARCHON  i386

>Description:

  make.conf includes both "optimisation" and "optimization" spellings.
  They should be standardized in American English.

>How-To-Repeat:

>Fix:

For 5-CURRENT:

Index: make.conf
===================================================================
RCS file: /home/ncvs/src/etc/defaults/make.conf,v
retrieving revision 1.129
diff -u -r1.129 make.conf
--- make.conf	2000/11/04 08:43:13	1.129
+++ make.conf	2000/11/05 14:41:53
@@ -10,9 +10,9 @@
 # documentation of the source tree.
 #
 # CFLAGS controls the compiler settings used when compiling C code.
-# Note that optimisation settings above -O (-O2, ...) are not recommended
+# Note that optimization settings above -O (-O2, ...) are not recommended
 # or supported for compiling the world or the kernel - please revert any
-# nonstandard optimisation settings to "-O" before submitting bug reports
+# nonstandard optimization settings to "-O" before submitting bug reports
 # to the developers.
 # Note also that at this time the -O2 setting is known to produce BROKEN
 # CODE on the Alpha platform.
@@ -35,7 +35,7 @@
 		-Wmissing-prototypes -Wnested-externs -Wpointer-arith \
 		-Wredundant-decls -Wshadow -Wstrict-prototypes -Wwrite-strings
 #
-# To compile just the kernel with special optimisations, you should use
+# To compile just the kernel with special optimizations, you should use
 # this instead of CFLAGS (which is not applicable to kernel builds anyway).
 # There is very little to gain by using higher optimization levels, and doing
 # so can cause problems.


For 4-STABLE:

Index: make.conf
===================================================================
RCS file: /home/ncvs/src/etc/defaults/make.conf,v
retrieving revision 1.97.2.24
diff -u -r1.97.2.24 make.conf
--- make.conf	2000/11/01 10:26:13	1.97.2.24
+++ make.conf	2000/11/05 14:43:03
@@ -10,9 +10,9 @@
 # documentation of the source tree.
 #
 # CFLAGS controls the compiler settings used when compiling C code.
-# Note that optimisation settings above -O (-O2, ...) are not recommended
+# Note that optimization settings above -O (-O2, ...) are not recommended
 # or supported for compiling the world or the kernel - please revert any
-# nonstandard optimisation settings to "-O" before submitting bug reports
+# nonstandard optimization settings to "-O" before submitting bug reports
 # to the developers.
 # Note also that at this time the -O2 setting is known to produce BROKEN
 # CODE on the Alpha platform.
@@ -35,7 +35,7 @@
 		-Wmissing-prototypes -Wnested-externs -Wpointer-arith \
 		-Wredundant-decls -Wshadow -Wstrict-prototypes -Wwrite-strings
 #
-# To compile just the kernel with special optimisations, you should use
+# To compile just the kernel with special optimizations, you should use
 # this instead of CFLAGS (which is not applicable to kernel builds anyway):
 #
 #COPTFLAGS= -O -pipe


For 3-STABLE:

Index: make.conf
===================================================================
RCS file: /home/ncvs/src/etc/Attic/make.conf,v
retrieving revision 1.73.2.12
diff -u -r1.73.2.12 make.conf
--- make.conf	2000/10/24 12:50:23	1.73.2.12
+++ make.conf	2000/11/05 14:43:39
@@ -10,9 +10,9 @@
 # documentation of the source tree.
 #
 # CFLAGS controls the compiler settings used when compiling C code.
-# Note that optimisation settings above -O (-O2, ...) are not recommended
+# Note that optimization settings above -O (-O2, ...) are not recommended
 # or supported for compiling the world or the kernel - please revert any
-# nonstandard optimisation settings to "-O" before submitting bug reports
+# nonstandard optimization settings to "-O" before submitting bug reports
 # to the developers.
 # Note also that at this time the -O2 setting is known to produce BROKEN
 # CODE on the Alpha platform.
@@ -44,7 +44,7 @@
 #       (they aren't needed/necessary)
 #OBJLINK=	yes
 #
-# To compile just the kernel with special optimisations, you should use
+# To compile just the kernel with special optimizations, you should use
 # this instead of CFLAGS (which is not applicable to kernel builds anyway):
 #
 #COPTFLAGS= -O -pipe

-- 
                           /
                          /__  __
                         / )  )  ) )  /    and.or.jp / ruby-lang.org
Akinori -Aki- MUSHA aka / (_ /  ( (__(  @ idaemons.org / FreeBSD.org

"We're only at home when we're on the run, on the wing, on the fly"

>Release-Note:
>Audit-Trail:
>Unformatted:


To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-bugs" in the body of the message




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?86zojetqx7.wl>