summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--devel/cpuflags/Makefile4
-rw-r--r--devel/cpuflags/files/Makefile4
-rw-r--r--devel/cpuflags/files/optimize_gcc.mk48
-rw-r--r--doc/CHANGES-20073
4 files changed, 32 insertions, 27 deletions
diff --git a/devel/cpuflags/Makefile b/devel/cpuflags/Makefile
index 520b88c89df..2d3ec7913aa 100644
--- a/devel/cpuflags/Makefile
+++ b/devel/cpuflags/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.113 2007/08/20 11:21:19 abs Exp $
+# $NetBSD: Makefile,v 1.114 2007/08/20 11:34:05 abs Exp $
#
-DISTNAME= cpuflags-1.10
+DISTNAME= cpuflags-1.11
CATEGORIES= sysutils
MASTER_SITES= # empty
DISTFILES= # empty
diff --git a/devel/cpuflags/files/Makefile b/devel/cpuflags/files/Makefile
index 318ad630244..99b573a992f 100644
--- a/devel/cpuflags/files/Makefile
+++ b/devel/cpuflags/files/Makefile
@@ -1,6 +1,6 @@
-# $Id: Makefile,v 1.8 2007/08/20 11:21:20 abs Exp $
+# $Id: Makefile,v 1.9 2007/08/20 11:34:05 abs Exp $
-VERSION=1.10
+VERSION=1.11
PREFIX?=/usr/local
OPSYS?=`uname`
diff --git a/devel/cpuflags/files/optimize_gcc.mk b/devel/cpuflags/files/optimize_gcc.mk
index 402542dec4d..8a1a200d754 100644
--- a/devel/cpuflags/files/optimize_gcc.mk
+++ b/devel/cpuflags/files/optimize_gcc.mk
@@ -1,4 +1,4 @@
-# $Id: optimize_gcc.mk,v 1.32 2007/08/13 10:31:06 abs Exp $
+# $Id: optimize_gcc.mk,v 1.33 2007/08/20 11:34:05 abs Exp $
# This file is 'experimental' - which is doublespeak for unspeakably
# ugly, and quite broken by design.
@@ -8,39 +8,47 @@
# compile some code, and even generate curdled binaries. It is completely
# unsupported. Any questions should be directed to <abs@absd.org>.
-# -O3 would give -finline-functions and -frename-registers
-# As of gcc3-3.3nb4 -frename-registers still causes problems with xdm
-
.ifdef BSD_PKG_MK # Try to catch various package opts
-# This is a horrible mess, but how else to adjust per package?
-
-COPT_FLAGS=-finline-functions -fomit-frame-pointer -ffast-math
+# -----------------------------------------------------------------------------
+# Per package exclusions
-# v1.0, NetBSD i386/2.0
+# firefox-1: v1.0, NetBSD i386/2.0
PKG_EXCLUDE_OMIT_FRAME_POINTER+=www/firefox www/firefox-gtk1
PKG_EXCLUDE_OMIT_FRAME_POINTER+=www/firefox15 www/firefox15-gtk1
+PKG_EXCLUDE_FAST_MATH+=www/firefox www/firefox-gtk1
+PKG_EXCLUDE_FAST_MATH+=www/firefox15 www/firefox15-gtk1
-PKG_EXCLUDE_OMIT_FRAME_POINTER+=lang/lua
-
-# 1.0.5 gcc-4.1.2 NetBSD 4.99.3 i386
+# seamonkey-1.0.5: gcc-4.1.2 NetBSD 4.99.3 i386
PKG_EXCLUDE_OMIT_FRAME_POINTER+=www/seamonkey www/seamonkey-gtk1
PKG_EXCLUDE_OMIT_FRAME_POINTER+=mail/thunderbird mail/thunderbird-gtk1
PKG_EXCLUDE_OMIT_FRAME_POINTER+=mail/thunderbird15 mail/thunderbird15-gtk1
+
+PKG_EXCLUDE_OMIT_FRAME_POINTER+=lang/lua
PKG_EXCLUDE_OMIT_FRAME_POINTER+=lang/ruby18-base # NetBSD i386/3.0
+# perl5: '49/49!=1 in test'
+PKG_EXCLUDE_FAST_MATH+=lang/perl5
+
PKG_EXCLUDE_INLINE_FUNCTIONS+=emulators/qemu net/userppp multimedia/vlc
-# binutils-2.17, Linux 2.6.21.5 i686, gcc-4.1.3
+# binutils-2.17: Linux 2.6.21.5 i686, gcc-4.1.3
PKG_EXCLUDE_INLINE_FUNCTIONS+=cross/binutils devel/binutils
-# v1.0, NetBSD i386/2.0
-PKG_EXCLUDE_FAST_MATH+=www/firefox www/firefox-gtk1
-PKG_EXCLUDE_FAST_MATH+=www/firefox15 www/firefox15-gtk1
+# procmail-3.22: debian_linux-2.6.21.5/gcc-4.1.3, gcc-4.1.2 NetBSD 4.0_BETA2
+PKG_EXCLUDE_INLINE_FUNCTIONS+=mail/procmail
-PKG_EXCLUDE_FAST_MATH+=x11/qt3-libs # gcc3.3.3 NetBSD i386/3.0 breaks kde3
-PKG_EXCLUDE_FAST_MATH+=lang/perl5 # perl5 '49/49!=1'
+# aspell-0.60.5: gcc-4.1.2 NetBSD 4.0_BETA2 i386
+PKG_EXCLUDE_INLINE_FUNCTIONS+=textproc/aspell
+
+# gcc3.3.3 NetBSD i386/3.0 breaks kde3
+PKG_EXCLUDE_FAST_MATH+=x11/qt3-libs
+
+# -----------------------------------------------------------------------------
+# Assign default flags, then remove values based on settings above
+#
+COPT_FLAGS=-finline-functions -fomit-frame-pointer -ffast-math
.if !empty(PKG_EXCLUDE_OMIT_FRAME_POINTER:M${PKGPATH})
COPT_FLAGS:= ${COPT_FLAGS:S/-fomit-frame-pointer//}
@@ -58,7 +66,7 @@ CFLAGS+=${COPT_FLAGS}
CXXFLAGS+=${COPT_FLAGS}
MAKE_FLAGS+=CCOPTIONS="${COPT_FLAGS}" # Override CCOPTIONS for imake
-.else # Assume in base system, only COPTS
+.else # (BSD_PKG_MK) Assume in NetBSD base system, only COPTS
.if ${USETOOLS:Uyes} == "no"
COPT_FLAGS+=-fomit-frame-pointer
@@ -70,8 +78,4 @@ COPTS+=${COPT_FLAGS}
.endif
.endif
-.if defined(USE_GCC3)
-DEFWARNINGS=no
-.endif
-
.endif
diff --git a/doc/CHANGES-2007 b/doc/CHANGES-2007
index 4ab334e2985..43440f18851 100644
--- a/doc/CHANGES-2007
+++ b/doc/CHANGES-2007
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES-2007,v 1.1842 2007/08/20 11:25:28 abs Exp $
+$NetBSD: CHANGES-2007,v 1.1843 2007/08/20 11:35:15 abs Exp $
Changes to the packages collection and infrastructure in 2007:
@@ -3375,3 +3375,4 @@ Changes to the packages collection and infrastructure in 2007:
Updated mail/policyd to 1.82 [ghen 2007-08-20]
Updated security/py-denyhosts to 2.6nb2 [taca 2007-08-20]
Updated devel/cpuflags to 1.10 [abs 2007-08-20]
+ Updated devel/cpuflags to 1.11 [abs 2007-08-20]