Fixes -ggdb3 GNU 'as' incompatiblity - commit to trunk

enzo1982 · Jul 13, 2009 · 44c01ca · 44c01ca
1 parent f5e5054
commit 44c01ca
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/configure.ac b/configure.ac
@@ -189,6 +189,15 @@ AC_SUBST([PROJECT_build])
 # checks for typedefs, structures, and compiler characteristics
 ###############################################################################
 
+###############################################################################
+# replace -ggdb3 with -ggdb2 to avoid GNU 'as' from failing
+# See http://code.google.com/p/mp4v2/issues/detail?id=27
+###############################################################################
+if test "$GXX" = "yes"; then
+	CXXFLAGS_GGDB3=`echo "$CXXFLAGS" | sed -e 's/-ggdb3/-ggdb2/'`
+	CXXFLAGS="$CXXFLAGS_GGDB3"
+fi
+
 ###############################################################################
 # additional ldflags
 ###############################################################################

diff --git a/libplatform/config.h.in b/libplatform/config.h.in
@@ -30,10 +30,6 @@
 /* Define to 1 if you have the <unistd.h> header file. */
 #undef HAVE_UNISTD_H
 
-/* Define to the sub-directory in which libtool stores uninstalled libraries.
-   */
-#undef LT_OBJDIR
-
 /* Define to 1 if LFS should be activated */
 #undef NEED_LFS_ACTIVATION
 

diff --git a/maintainer/HOWTO-RELEASE.txt b/maintainer/HOWTO-RELEASE.txt
@@ -108,6 +108,7 @@ to branch from 1.0.0 (not trunk!). Here is an example 1.0.1 point-release.
     svn cp -m "BRANCHED: RELEASE 1.0.1" \
         https://mp4v2.googlecode.com/svn/releases/1.0.0 \
         https://mp4v2.googlecode.com/svn/releases/1.0.1
+    svn co https://mp4v2.googlecode.com/svn/releases/1.0.1
     cd 1.0.1/
     vi project/project.m4sugar # bump version to 1.0.1
     svn ci