summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkonablend <[email protected]>2009-05-02 21:18:28 +0000
committerkonablend <[email protected]>2009-05-02 21:18:28 +0000
commite5aaf58dc69573414ca03f5721768dc8557d93cf (patch)
tree9e42ffa26fab78d8d93599f6366d0a7317999dbf
parentfdee73845cd30f80b18dde06146ac78a5affaebb (diff)
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://svn.handbrake.fr/HandBrake/trunk@2367 b64f7644-9d1e-0410-96f1-a4d463321fa5
-rw-r--r--contrib/libmp4v2/module.defs4
-rw-r--r--make/variant/cygwin.defs8
-rw-r--r--make/variant/freebsd.defs8
-rw-r--r--make/variant/linux.defs8
-rw-r--r--make/variant/mingw.defs10
-rw-r--r--make/variant/solaris.defs8
6 files changed, 24 insertions, 22 deletions
diff --git a/contrib/libmp4v2/module.defs b/contrib/libmp4v2/module.defs
index 434d93f75..784fc16d4 100644
--- 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 bab73c6ca..b17166d1f 100644
--- 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 9a807b8d4..251debcf4 100644
--- 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 f0babe87c..c70327292 100644
--- 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 81c2b043a..f521e24f5 100644
--- 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 9a807b8d4..251debcf4 100644
--- 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