diff options
| author | jlam <jlam@pkgsrc.org> | 2001-02-26 16:30:19 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2001-02-26 16:30:19 +0000 |
| commit | 0121a8d627845c9d4b9f3fc840bbfe628fa6a3a2 (patch) | |
| tree | 1feb543f03806b7dee095567b757bc7b79fc0446 /audio | |
| parent | 62f21b2fcefc9b17a75b6c755c3a67a6f510efcd (diff) | |
| download | pkgsrc-0121a8d627845c9d4b9f3fc840bbfe628fa6a3a2.tar.gz | |
Honor CFLAGS passed in from environment, and for NetBSD/i386, don't
explicitly pass -m486 flag to compiler.
Diffstat (limited to 'audio')
| -rw-r--r-- | audio/mpg123/files/patch-sum | 4 | ||||
| -rw-r--r-- | audio/mpg123/patches/patch-aa | 15 |
2 files changed, 10 insertions, 9 deletions
diff --git a/audio/mpg123/files/patch-sum b/audio/mpg123/files/patch-sum index 16c8014c04e..b7c875ba0dd 100644 --- a/audio/mpg123/files/patch-sum +++ b/audio/mpg123/files/patch-sum @@ -1,6 +1,6 @@ -$NetBSD: patch-sum,v 1.8 2000/03/01 22:26:18 pooka Exp $ +$NetBSD: patch-sum,v 1.9 2001/02/26 16:30:19 jlam Exp $ -MD5 (patch-aa) = d19cf8f63d73356d1f322df231f7671a +MD5 (patch-aa) = c61c04dcc84685128424aff6e0ec6758 MD5 (patch-ab) = d2be05cddc78b15c1dda564dde29d693 MD5 (patch-ac) = 83eac6fce5e87b1f4dba3fbfc163c01c MD5 (patch-ad) = 49bcf488decbcdb509689ac7cab46175 diff --git a/audio/mpg123/patches/patch-aa b/audio/mpg123/patches/patch-aa index 92b08385279..a725bd57bd3 100644 --- a/audio/mpg123/patches/patch-aa +++ b/audio/mpg123/patches/patch-aa @@ -1,7 +1,7 @@ -$NetBSD: patch-aa,v 1.14 2000/03/01 22:03:37 pooka Exp $ +$NetBSD: patch-aa,v 1.15 2001/02/26 16:30:19 jlam Exp $ ---- Makefile.orig Fri Feb 18 19:45:31 2000 -+++ Makefile Fri Feb 18 19:46:51 2000 +--- Makefile.orig Mon Feb 26 10:58:56 2001 ++++ Makefile @@ -54,6 +54,10 @@ @echo "make aix-tk3play IBM AIX" @echo "make os2 IBM OS/2" @@ -21,7 +21,7 @@ $NetBSD: patch-aa,v 1.14 2000/03/01 22:03:37 pooka Exp $ + $(MAKE) CC=cc LDFLAGS= \ + OBJECTS='decode_i386.o dct64_i386.o decode_i586.o \ + audio_sun.o term.o' \ -+ CFLAGS='-Wall -ansi -pedantic -O4 -m486 -fomit-frame-pointer \ ++ CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O4 -fomit-frame-pointer \ + -funroll-all-loops -ffast-math -DROT_I386 \ + -DI386_ASSEM -DPENTIUM_OPT -DREAL_IS_FLOAT -DUSE_MMAP \ + -DREAD_MMAP -DNETBSD -DTERM_CONTROL' \ @@ -30,7 +30,7 @@ $NetBSD: patch-aa,v 1.14 2000/03/01 22:03:37 pooka Exp $ +netbsd-m68k: + $(MAKE) CC=cc LDFLAGS= \ + OBJECTS='decode.o dct64.o audio_sun.o term.o' \ -+ CFLAGS='-Wall -ansi -pedantic -O3 -fomit-frame-pointer \ ++ CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O3 -fomit-frame-pointer \ + -ffast-math -DREAL_IS_FLOAT \ + -DUSE_MMAP -DNETBSD -DM68K_ASSEM -DTERM_CONTROL' \ + mpg123-make @@ -38,7 +38,7 @@ $NetBSD: patch-aa,v 1.14 2000/03/01 22:03:37 pooka Exp $ +netbsd-arm32: + $(MAKE) CC=cc LDFLAGS= \ + OBJECTS='decode.o dct64.o audio_sun.o term.o' \ -+ CFLAGS='-Wall -O6 -fomit-frame-pointer \ ++ CFLAGS='$(CFLAGS) -Wall -O6 -fomit-frame-pointer \ + -funroll-all-loops -finline-functions -ffast-math \ + -march=armv4 -mtune=strongarm -mcpu=strongarm \ + -DREAL_IS_FIXED -DUSE_MMAP -DREAD_MMAP -DTERM_CONTROL \ @@ -63,8 +63,9 @@ $NetBSD: patch-aa,v 1.14 2000/03/01 22:03:37 pooka Exp $ netbsd-i386: $(MAKE) CC=cc LDFLAGS= \ - OBJECTS='decode_i386.o dct64_i386.o audio_sun.o' \ +- CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O4 -m486 -fomit-frame-pointer \ + OBJECTS='decode_i386.o dct64_i386.o audio_sun.o term.o' \ - CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O4 -m486 -fomit-frame-pointer \ ++ CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O4 -fomit-frame-pointer \ -funroll-all-loops -ffast-math -DROT_I386 \ - -DI386_ASSEM -DREAL_IS_FLOAT -DUSE_MMAP -DNETBSD' \ + -DI386_ASSEM -DREAL_IS_FLOAT -DUSE_MMAP -DTERM_CONTROL -DNETBSD' \ |