[pkgsrc/trunk]: pkgsrc/multimedia/vlc07 Fix the build error with newer gcc, s...

[drochner <drochner%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/87854d2a76bb
branches:  trunk
changeset: 533782:87854d2a76bb
user:      drochner <drochner%pkgsrc.org@localhost>
date:      Sat Sep 29 19:44:05 2007 +0000

description:
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:

 multimedia/vlc07/Makefile         |  10 +++++++++-
 multimedia/vlc07/distinfo         |   3 ++-
 multimedia/vlc07/patches/patch-ai |  13 +++++++++++++
 3 files changed, 24 insertions(+), 2 deletions(-)

diffs (55 lines):

diff -r 875d00339e3a -r 87854d2a76bb multimedia/vlc07/Makefile
--- a/multimedia/vlc07/Makefile Sat Sep 29 16:34:42 2007 +0000
+++ b/multimedia/vlc07/Makefile Sat Sep 29 19:44:05 2007 +0000
@@ -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 @@
 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 -r 875d00339e3a -r 87854d2a76bb multimedia/vlc07/distinfo
--- a/multimedia/vlc07/distinfo Sat Sep 29 16:34:42 2007 +0000
+++ b/multimedia/vlc07/distinfo Sat Sep 29 19:44:05 2007 +0000
@@ -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-af) = ad79f35070495bbbe555bcc85bfa24b4bcbcb322
 SHA1 (patch-ag) = e71070ddfd8a06978d092e2e103308a52e101e13
 SHA1 (patch-ah) = 810c1341241d4fb800810c70c5eeb5ae5b5eb2dc
+SHA1 (patch-ai) = f512852628a5e6922c7a431c089b1797625968ca
diff -r 875d00339e3a -r 87854d2a76bb multimedia/vlc07/patches/patch-ai
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/multimedia/vlc07/patches/patch-ai Sat Sep 29 19:44:05 2007 +0000
@@ -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