From 5a3bdc6b88d68257d7acd6c1b5be55de1c887d17 Mon Sep 17 00:00:00 2001
From: marino <marino@pkgsrc.org>
Date: Tue, 9 Oct 2012 17:53:51 +0000
Subject: multimedia/gpac: Fix linker flag bug

GCC 4.6+ does not tolerate flags starting with "--" like older versions
do.  These flags were meant to fall to the linker, but starting with
GCC 4.6, they have to be explicitly prefixed with "-Wl,".

Fix the gcc 4.7 breakage on "--warn-common".
---
 multimedia/gpac/distinfo         |  4 ++--
 multimedia/gpac/patches/patch-ac | 17 +++++++++++++++--
 2 files changed, 17 insertions(+), 4 deletions(-)

(limited to 'multimedia/gpac')

diff --git a/multimedia/gpac/distinfo b/multimedia/gpac/distinfo
index 275dfcb3ffb..5754d73fe16 100644
--- a/multimedia/gpac/distinfo
+++ b/multimedia/gpac/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.5 2012/05/22 05:58:47 joerg Exp $
+$NetBSD: distinfo,v 1.6 2012/10/09 17:53:51 marino Exp $
 
 SHA1 (gpac-0.4.5.tar.gz) = 2ec03c1d7dc3f4d10c0f7b47696cc1e753a56fc8
 RMD160 (gpac-0.4.5.tar.gz) = 21249249a412efa5d1237907cb6b8cfe6282e86f
 Size (gpac-0.4.5.tar.gz) = 4269054 bytes
 SHA1 (patch-aa) = bd4a1314fa80ced3cc4aaa632e4a522f877207a9
 SHA1 (patch-ab) = 19bb0746ced98fbb438673a406a570cad7aaabb4
-SHA1 (patch-ac) = 25f8b92a308b6a70fb160980fe86e7d3e3f3f0ac
+SHA1 (patch-ac) = 6b4d87c366d27d997c81014d152535150ac48042
 SHA1 (patch-ad) = 32eac449b1b108937f9a723d7c4ba622182cf9ed
 SHA1 (patch-extra_lib__include__ffmpeg__avio.h) = dff4609d59ec5da3788e2b613b73075eda0e7af0
 SHA1 (patch-modules_oss__audio_Makefile) = 523e9fdfa620de073db3b388d25d18906c8001db
diff --git a/multimedia/gpac/patches/patch-ac b/multimedia/gpac/patches/patch-ac
index 5b8fcc60ff1..639904bc89a 100644
--- a/multimedia/gpac/patches/patch-ac
+++ b/multimedia/gpac/patches/patch-ac
@@ -1,7 +1,20 @@
-$NetBSD: patch-ac,v 1.1.1.1 2009/01/23 14:54:23 jmcneill Exp $
+$NetBSD: patch-ac,v 1.2 2012/10/09 17:53:51 marino Exp $
 
---- configure.orig	2009-01-23 09:22:30.000000000 -0500
+GCC 4.6+ chokes on "--warn-common" which older versions of GCC left fall to
+the linker.  The missing "," after "-Wl" is no longer acceptable.
+Rest is from original version of patch
+
+--- configure.orig	2008-12-02 18:04:42.000000000 +0000
 +++ configure
+@@ -102,7 +102,7 @@ extralibs="-lm"
+ bigendian="no"
+ SHFLAGS=-shared
+ need_inet_aton="no"
+-LDFLAGS="$LDFLAGS -Wl --warn-common"
++LDFLAGS="$LDFLAGS -Wl,--warn-common"
+ CFLAGS=""
+ CPPFLAGS=""
+ GPAC_SH_FLAGS=-lpthread
 @@ -217,12 +217,16 @@ case "$cpu" in
    ;;
    x86_64|amd64)
-- 
cgit v1.2.3