diff options
| author | abs <abs@pkgsrc.org> | 2003-08-07 11:30:04 +0000 |
|---|---|---|
| committer | abs <abs@pkgsrc.org> | 2003-08-07 11:30:04 +0000 |
| commit | 8892b690fa3a98f7c2ef58036ec358d9f0f6e1b8 (patch) | |
| tree | 6324da251d740ee868e22636df90adff10de10a2 | |
| parent | cf8c97de6a383a01e271160c077001cb4a53a595 (diff) | |
| download | pkgsrc-8892b690fa3a98f7c2ef58036ec358d9f0f6e1b8.tar.gz | |
Updated cpuflags to 0.56
- If !defined BSD_PKG_MK and DBG is set to -Os, do not alter COPTS.
This stops setting of -march=XXX causing overflowing of install media
- disable -fomit-frame-pointer for lua and koffice
| -rw-r--r-- | devel/cpuflags/Makefile | 4 | ||||
| -rw-r--r-- | devel/cpuflags/files/cpuflags.mk | 5 | ||||
| -rw-r--r-- | devel/cpuflags/files/optimize_gcc.mk | 6 |
3 files changed, 8 insertions, 7 deletions
diff --git a/devel/cpuflags/Makefile b/devel/cpuflags/Makefile index 3aaf15d99df..50cb926dc54 100644 --- a/devel/cpuflags/Makefile +++ b/devel/cpuflags/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.58 2003/07/20 14:21:52 abs Exp $ +# $NetBSD: Makefile,v 1.59 2003/08/07 11:30:04 abs Exp $ # -DISTNAME= cpuflags-0.55 +DISTNAME= cpuflags-0.56 CATEGORIES= sysutils MASTER_SITES= # empty DISTFILES= # empty diff --git a/devel/cpuflags/files/cpuflags.mk b/devel/cpuflags/files/cpuflags.mk index 08cdea26a09..9413b4f0758 100644 --- a/devel/cpuflags/files/cpuflags.mk +++ b/devel/cpuflags/files/cpuflags.mk @@ -1,4 +1,4 @@ -# $Id: cpuflags.mk,v 1.9 2003/06/06 15:26:50 abs Exp $ +# $Id: cpuflags.mk,v 1.10 2003/08/07 11:30:05 abs Exp $ # Makefile include fragment to simplify use of cpuflags in pkgsrc # abs@netbsd.org - freely distributable, no warrenties, stick no bills. @@ -30,7 +30,8 @@ CFLAGS+=${CPU_FLAGS} CXXFLAGS+=${CPU_FLAGS} MAKE_FLAGS+=CCOPTIONS="${CPU_FLAGS}" # Override CCOPTIONS for imake -.else # Assume in base system, only COPTS +.elif !defined(DBG) || ${DBG} != "-Os" +# Assume in base system and not building distrib optimised for space, set COPTS COPTS?=${CPU_FLAGS} ${DEFCOPTS} # Include ${DEFCOPTS} and set ?= to allow overriding in kernel builds diff --git a/devel/cpuflags/files/optimize_gcc.mk b/devel/cpuflags/files/optimize_gcc.mk index d41abe5c020..e7ce560738d 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.12 2003/07/20 14:21:52 abs Exp $ +# $Id: optimize_gcc.mk,v 1.13 2003/08/07 11:30:05 abs Exp $ # This file is 'experimental' - which is doublespeak for unspeakably # ugly, and probably quite broken by design. @@ -29,10 +29,10 @@ PKGBASE=${.CURDIR:C:.*/::} COPT_FLAGS+=-ffast-math -fomit-frame-pointer -PKG_EXCLUDE_OMIT_FRAME_POINTER+=galeon lua4 mozilla phoenix +PKG_EXCLUDE_OMIT_FRAME_POINTER+=galeon lua lua4 mozilla phoenix PKG_EXCLUDE_INLINE_FUNCTIONS+=userppp .if !defined(USE_GCC3) -PKG_EXCLUDE_OMIT_FRAME_POINTER+=qt3-libs kdeedu3 +PKG_EXCLUDE_OMIT_FRAME_POINTER+=qt3-libs kdeedu3 koffice .endif .if !empty(PKG_EXCLUDE_OMIT_FRAME_POINTER:M${PKGBASE}) |