Tue Oct 9 17:53:51 2012 UTC ()
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".


(marino)
diff -r1.5 -r1.6 pkgsrc/multimedia/gpac/distinfo
diff -r1.1.1.1 -r1.2 pkgsrc/multimedia/gpac/patches/patch-ac
cvs diff -r1.5 -r1.6 pkgsrc/multimedia/gpac/distinfo (expand / switch to unified diff)

--- pkgsrc/multimedia/gpac/distinfo 2012/05/22 05:58:47 1.5
+++ pkgsrc/multimedia/gpac/distinfo 2012/10/09 17:53:51 1.6
@@ -1,11 +1,11 @@ @@ -1,11 +1,11 @@
1$NetBSD: distinfo,v 1.5 2012/05/22 05:58:47 joerg Exp $ 1$NetBSD: distinfo,v 1.6 2012/10/09 17:53:51 marino Exp $
2 2
3SHA1 (gpac-0.4.5.tar.gz) = 2ec03c1d7dc3f4d10c0f7b47696cc1e753a56fc8 3SHA1 (gpac-0.4.5.tar.gz) = 2ec03c1d7dc3f4d10c0f7b47696cc1e753a56fc8
4RMD160 (gpac-0.4.5.tar.gz) = 21249249a412efa5d1237907cb6b8cfe6282e86f 4RMD160 (gpac-0.4.5.tar.gz) = 21249249a412efa5d1237907cb6b8cfe6282e86f
5Size (gpac-0.4.5.tar.gz) = 4269054 bytes 5Size (gpac-0.4.5.tar.gz) = 4269054 bytes
6SHA1 (patch-aa) = bd4a1314fa80ced3cc4aaa632e4a522f877207a9 6SHA1 (patch-aa) = bd4a1314fa80ced3cc4aaa632e4a522f877207a9
7SHA1 (patch-ab) = 19bb0746ced98fbb438673a406a570cad7aaabb4 7SHA1 (patch-ab) = 19bb0746ced98fbb438673a406a570cad7aaabb4
8SHA1 (patch-ac) = 25f8b92a308b6a70fb160980fe86e7d3e3f3f0ac 8SHA1 (patch-ac) = 6b4d87c366d27d997c81014d152535150ac48042
9SHA1 (patch-ad) = 32eac449b1b108937f9a723d7c4ba622182cf9ed 9SHA1 (patch-ad) = 32eac449b1b108937f9a723d7c4ba622182cf9ed
10SHA1 (patch-extra_lib__include__ffmpeg__avio.h) = dff4609d59ec5da3788e2b613b73075eda0e7af0 10SHA1 (patch-extra_lib__include__ffmpeg__avio.h) = dff4609d59ec5da3788e2b613b73075eda0e7af0
11SHA1 (patch-modules_oss__audio_Makefile) = 523e9fdfa620de073db3b388d25d18906c8001db 11SHA1 (patch-modules_oss__audio_Makefile) = 523e9fdfa620de073db3b388d25d18906c8001db
cvs diff -r1.1.1.1 -r1.2 pkgsrc/multimedia/gpac/patches/Attic/patch-ac (expand / switch to unified diff)

--- pkgsrc/multimedia/gpac/patches/Attic/patch-ac 2009/01/23 14:54:23 1.1.1.1
+++ pkgsrc/multimedia/gpac/patches/Attic/patch-ac 2012/10/09 17:53:51 1.2
@@ -1,17 +1,30 @@ @@ -1,17 +1,30 @@
1$NetBSD: patch-ac,v 1.1.1.1 2009/01/23 14:54:23 jmcneill Exp $ 1$NetBSD: patch-ac,v 1.2 2012/10/09 17:53:51 marino Exp $
2 2
3--- configure.orig 2009-01-23 09:22:30.000000000 -0500 3GCC 4.6+ chokes on "--warn-common" which older versions of GCC left fall to
 4the linker. The missing "," after "-Wl" is no longer acceptable.
 5Rest is from original version of patch
 6
 7--- configure.orig 2008-12-02 18:04:42.000000000 +0000
4+++ configure 8+++ configure
 9@@ -102,7 +102,7 @@ extralibs="-lm"
 10 bigendian="no"
 11 SHFLAGS=-shared
 12 need_inet_aton="no"
 13-LDFLAGS="$LDFLAGS -Wl --warn-common"
 14+LDFLAGS="$LDFLAGS -Wl,--warn-common"
 15 CFLAGS=""
 16 CPPFLAGS=""
 17 GPAC_SH_FLAGS=-lpthread
5@@ -217,12 +217,16 @@ case "$cpu" in 18@@ -217,12 +217,16 @@ case "$cpu" in
6 ;; 19 ;;
7 x86_64|amd64) 20 x86_64|amd64)
8 cpu="x86" 21 cpu="x86"
9- is_64="yes" 22- is_64="yes"
10+ if test "$linux" = "yes" ; then 23+ if test "$linux" = "yes" ; then
11+ is_64="yes" 24+ is_64="yes"
12+ fi 25+ fi
13 canon_arch="`cc -dumpmachine | sed -e 's,\([^-]*\)-.*,\1,'`" 26 canon_arch="`cc -dumpmachine | sed -e 's,\([^-]*\)-.*,\1,'`"
14 if [ x"$canon_arch" = x"x86_64" -o x"$canon_arch" = x"amd64" ]; then 27 if [ x"$canon_arch" = x"x86_64" -o x"$canon_arch" = x"amd64" ]; then
15 if [ -z "`echo $CFLAGS | grep -- -m32`" ]; then 28 if [ -z "`echo $CFLAGS | grep -- -m32`" ]; then
16 cpu="x86_64" 29 cpu="x86_64"
17- libdir="lib64" 30- libdir="lib64"