diff options
| author | drochner <drochner> | 2007-09-29 19:44:05 +0000 |
|---|---|---|
| committer | drochner <drochner> | 2007-09-29 19:44:05 +0000 |
| commit | 43e2e39eb89c053cc6582d0f0502db581d383fa7 (patch) | |
| tree | 2593d132b7aa57f0d5557aa7daf5c59b1a883e7f /multimedia | |
| parent | a47e5cc9ca0fdf68153285e1821da99d7bba62de (diff) | |
| download | pkgsrc-43e2e39eb89c053cc6582d0f0502db581d383fa7.tar.gz | |
Fix the build error with newer gcc, seen in bulk builds: patch the
configure script to pass "-mtune=pentiumpro" instaead of -mcpu.
For gcc3.3.x, override this with a configure argument which makes
that -mcpu is still used. (The latter is untested.)
Diffstat (limited to 'multimedia')
| -rw-r--r-- | multimedia/vlc07/Makefile | 10 | ||||
| -rw-r--r-- | multimedia/vlc07/distinfo | 3 | ||||
| -rw-r--r-- | multimedia/vlc07/patches/patch-ai | 13 |
3 files changed, 24 insertions, 2 deletions
diff --git a/multimedia/vlc07/Makefile b/multimedia/vlc07/Makefile index d43c026080e..c0fcf5193c6 100644 --- a/multimedia/vlc07/Makefile +++ b/multimedia/vlc07/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2007/06/30 14:28:05 joerg Exp $ +# $NetBSD: Makefile,v 1.11 2007/09/29 19:44:05 drochner Exp $ # DISTNAME= vlc-${VLC_VER} @@ -50,6 +50,14 @@ PLIST_SUBST+= DVDCSS="@comment " CONFIGURE_ARGS+= x_libraries=${PREFIX}/lib .endif +.if ${MACHINE_ARCH} == i386 +.include "../../mk/compiler.mk" +.if !empty(CC_VERSION:Mgcc-3.3.*) +# XXX this makes that -mcpu is used, default is patched to -mtune +CONFIGURE_ARGS+= --with-tuning=pentiumpro +.endif +.endif + INSTALLATION_DIRS= share/vlc/skins/default share/vlc/skins2/default \ share/vlc/skins2/fonts share/vlc/http/admin \ share/vlc/http/vlm diff --git a/multimedia/vlc07/distinfo b/multimedia/vlc07/distinfo index 5020465a0b4..55ca8501707 100644 --- a/multimedia/vlc07/distinfo +++ b/multimedia/vlc07/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.3 2007/06/22 14:34:16 lkundrak Exp $ +$NetBSD: distinfo,v 1.4 2007/09/29 19:44:05 drochner Exp $ SHA1 (vlc-0.7.2.tar.bz2) = 938eaea128af02451fcbf0305c84ce290c9d8c21 RMD160 (vlc-0.7.2.tar.bz2) = 05e35e0b9080581cfbc730212fc756cb46bd3257 @@ -11,3 +11,4 @@ SHA1 (patch-ae) = 1dcc0466a362fcdf51fbce8869cd1a48d35d3909 SHA1 (patch-af) = ad79f35070495bbbe555bcc85bfa24b4bcbcb322 SHA1 (patch-ag) = e71070ddfd8a06978d092e2e103308a52e101e13 SHA1 (patch-ah) = 810c1341241d4fb800810c70c5eeb5ae5b5eb2dc +SHA1 (patch-ai) = f512852628a5e6922c7a431c089b1797625968ca diff --git a/multimedia/vlc07/patches/patch-ai b/multimedia/vlc07/patches/patch-ai new file mode 100644 index 00000000000..cbe199fe5e5 --- /dev/null +++ b/multimedia/vlc07/patches/patch-ai @@ -0,0 +1,13 @@ +$NetBSD: patch-ai,v 1.1 2007/09/29 19:44:05 drochner Exp $ + +--- configure.orig 2007-09-29 19:54:28.000000000 +0200 ++++ configure +@@ -18021,7 +18021,7 @@ if test -n "${with_tuning}"; then + fi + else + if test "${target_cpu}" = "i686" -o "${target_cpu}" = "i586" -o "${target_cpu}" = "i486" -o "${target_cpu}" = "i386"; then +- CFLAGS_TUNING="-mcpu=pentiumpro" ++ CFLAGS_TUNING="-mtune=pentiumpro" + else + if test "${target_cpu}" = "powerpc"; then CFLAGS_TUNING="-mtune=750"; fi + fi |