diff options
author | dholland <dholland@pkgsrc.org> | 2011-09-04 01:39:21 +0000 |
---|---|---|
committer | dholland <dholland@pkgsrc.org> | 2011-09-04 01:39:21 +0000 |
commit | 53aa6ec077100f34636a80c6965b287630b2cae7 (patch) | |
tree | 5e8be1daef33d7462bc9f48607ff139e9bc023b1 /audio/amp/patches | |
parent | 01003f7c402be57bd63ae5e07eafbbebb92efeb8 (diff) | |
download | pkgsrc-53aa6ec077100f34636a80c6965b287630b2cae7.tar.gz |
Don't use -O6, clang doesn't like it and it doesn't mean anything to gcc
either. Stick to -O3. While here, sync the patches for configure and
configure.in, and give it the ability to recognize OpenBSD as well.
(which might or might not work)
Diffstat (limited to 'audio/amp/patches')
-rw-r--r-- | audio/amp/patches/patch-ae | 25 | ||||
-rw-r--r-- | audio/amp/patches/patch-af | 10 |
2 files changed, 26 insertions, 9 deletions
diff --git a/audio/amp/patches/patch-ae b/audio/amp/patches/patch-ae index df070e4a1c0..040e53df034 100644 --- a/audio/amp/patches/patch-ae +++ b/audio/amp/patches/patch-ae @@ -1,13 +1,28 @@ -$NetBSD: patch-ae,v 1.1 2003/03/22 05:44:38 dillo Exp $ +$NetBSD: patch-ae,v 1.2 2011/09/04 01:39:21 dholland Exp $ ---- configure.in.old Sun Oct 26 10:53:03 1997 -+++ configure.in Sun Oct 26 10:54:32 1997 -@@ -58,7 +58,7 @@ +- recognize NetBSD, OpenBSD, Dragonfly +- use -O3 (maximum level that means anything), not -O6 + +--- configure.in.orig 1997-08-23 11:35:41.000000000 +0000 ++++ configure.in +@@ -58,7 +58,7 @@ case "$OS_TYPE" in DEFINES="-DOS_$OS_TYPE -DARCH_$ARCH_TYPE" ;; - Linux|FreeBSD) -+ Linux|FreeBSD|NetBSD) ++ Linux|FreeBSD|NetBSD|OpenBSD|Dragonfly) CC="gcc" if test "$ARCH_TYPE" = "i486" ; then CFLAGS_ARCH="-m486" +@@ -69,7 +69,10 @@ case "$OS_TYPE" in + if test "$OS_TYPE" = "FreeBSD" ; then + OS_TYPE="BSD" + fi +- CFLAGS="-O6 -ffast-math -fomit-frame-pointer ${CFLAGS_ARCH}" ++ if test "$OS_TYPE" = "DragonFly" ; then ++ OS_TYPE="BSD" ++ fi ++ CFLAGS="-O3 -ffast-math -fomit-frame-pointer ${CFLAGS_ARCH}" + DEFINES="-DNO_BYTE_SWAPPING -DOS_$OS_TYPE -DARCH_$ARCH_TYPE" + ;; + diff --git a/audio/amp/patches/patch-af b/audio/amp/patches/patch-af index ac4fdfaea0e..92b6334136b 100644 --- a/audio/amp/patches/patch-af +++ b/audio/amp/patches/patch-af @@ -1,4 +1,4 @@ -$NetBSD: patch-af,v 1.2 2005/11/18 14:52:44 joerg Exp $ +$NetBSD: patch-af,v 1.3 2011/09/04 01:39:21 dholland Exp $ --- configure.orig 1997-08-23 11:11:24.000000000 +0000 +++ configure @@ -7,17 +7,19 @@ $NetBSD: patch-af,v 1.2 2005/11/18 14:52:44 joerg Exp $ ;; - Linux|FreeBSD) -+ Linux|FreeBSD|NetBSD|DragonFly) ++ Linux|FreeBSD|NetBSD|OpenBSD|DragonFly) CC="gcc" if test "$ARCH_TYPE" = "i486" ; then CFLAGS_ARCH="-m486" -@@ -1409,6 +1409,9 @@ case "$OS_TYPE" in +@@ -1409,7 +1409,10 @@ case "$OS_TYPE" in if test "$OS_TYPE" = "FreeBSD" ; then OS_TYPE="BSD" fi +- CFLAGS="-O6 -ffast-math -fomit-frame-pointer ${CFLAGS_ARCH}" + if test "$OS_TYPE" = "DragonFly" ; then + OS_TYPE="BSD" + fi - CFLAGS="-O6 -ffast-math -fomit-frame-pointer ${CFLAGS_ARCH}" ++ CFLAGS="-O3 -ffast-math -fomit-frame-pointer ${CFLAGS_ARCH}" DEFINES="-DNO_BYTE_SWAPPING -DOS_$OS_TYPE -DARCH_$ARCH_TYPE" ;; + |