BuildSystem: fix libmp4v2 error: Error: file number 2 already allocated

- building libmp4v2 w/ --debug=max (-g3) exposes a gch issue.
- workaround is to disable gch.
- corrected variant/*.defs files: GCC.args.g.default -> GCC.args.g.std

git-svn-id: svn://localhost/HandBrake/trunk@2367 b64f7644-9d1e-0410-96f1-a4d463321fa5

diff --git a/contrib/libmp4v2/module.defs b/contrib/libmp4v2/module.defs
index 434d93f..784fc16 100644 (file)
--- a/contrib/libmp4v2/module.defs
+++ b/contrib/libmp4v2/module.defs
@@ -10,4 +10,6 @@ LIBMP4V2.CONFIGURE.env.CXXFLAGS = CXXFLAGS="$(call fn.ARGS,LIBMP4V2.GCC,*archs *
 
 ## save some build-time by disabling utils
 LIBMP4V2.CONFIGURE.extra += --disable-util
-LIBMP4V2.CONFIGURE.extra += --enable-gch
+
+## make sure gch is disabled; we get build errors on linux with gcc-4.3.x and -g3
+LIBMP4V2.CONFIGURE.extra += --disable-gch

diff --git a/make/variant/cygwin.defs b/make/variant/cygwin.defs
index bab73c6..b17166d 100644 (file)
--- a/make/variant/cygwin.defs
+++ b/make/variant/cygwin.defs
@@ -2,7 +2,7 @@ GCC.muldefs = 1
 GCC.start   = 1
 GCC.end     = 1
 
-GCC.args.g.none    = -g0
-GCC.args.g.min     = -g1
-GCC.args.g.default = -g2
-GCC.args.g.max     = -g3
+GCC.args.g.none = -g0
+GCC.args.g.min  = -g1
+GCC.args.g.std  = -g2
+GCC.args.g.max  = -g3

diff --git a/make/variant/freebsd.defs b/make/variant/freebsd.defs
index 9a807b8..251debc 100644 (file)
--- a/make/variant/freebsd.defs
+++ b/make/variant/freebsd.defs
@@ -3,7 +3,7 @@ TARGET.dylib.ext = .so
 GCC.args.dylib = -shared
 GCC.args.pic   = 1
 
-GCC.args.g.none    = -g0
-GCC.args.g.min     = -g1
-GCC.args.g.default = -g2
-GCC.args.g.max     = -g3
+GCC.args.g.none = -g0
+GCC.args.g.min  = -g1
+GCC.args.g.std  = -g2
+GCC.args.g.max  = -g3

diff --git a/make/variant/linux.defs b/make/variant/linux.defs
index f0babe8..c703272 100644 (file)
--- a/make/variant/linux.defs
+++ b/make/variant/linux.defs
@@ -5,7 +5,7 @@ GCC.end        = 1
 GCC.args.dylib = -shared
 GCC.args.pic   = 1
 
-GCC.args.g.none    = -g0
-GCC.args.g.min     = -g1
-GCC.args.g.default = -g2
-GCC.args.g.max     = -g3
+GCC.args.g.none = -g0
+GCC.args.g.min  = -g1
+GCC.args.g.std  = -g2
+GCC.args.g.max  = -g3

diff --git a/make/variant/mingw.defs b/make/variant/mingw.defs
index 81c2b04..f521e24 100644 (file)
--- a/make/variant/mingw.defs
+++ b/make/variant/mingw.defs
@@ -3,8 +3,8 @@ TARGET.exe.suffix = .exe
 GCC.start = 1
 GCC.end   = 1
 
-GCC.args.dylib     = -shared
-GCC.args.g.none    = -g0
-GCC.args.g.min     = -g1
-GCC.args.g.default = -g2
-GCC.args.g.max     = -g3
+GCC.args.dylib  = -shared
+GCC.args.g.none = -g0
+GCC.args.g.min  = -g1
+GCC.args.g.std  = -g2
+GCC.args.g.max  = -g3

diff --git a/make/variant/solaris.defs b/make/variant/solaris.defs
index 9a807b8..251debc 100644 (file)
--- a/make/variant/solaris.defs
+++ b/make/variant/solaris.defs
@@ -3,7 +3,7 @@ TARGET.dylib.ext = .so
 GCC.args.dylib = -shared
 GCC.args.pic   = 1
 
-GCC.args.g.none    = -g0
-GCC.args.g.min     = -g1
-GCC.args.g.default = -g2
-GCC.args.g.max     = -g3
+GCC.args.g.none = -g0
+GCC.args.g.min  = -g1
+GCC.args.g.std  = -g2
+GCC.args.g.max  = -g3