From 44c01ca53673919e61d7b927a27e2bc7a0efcc66 Mon Sep 17 00:00:00 2001 From: eddygroenendaal Date: Mon, 13 Jul 2009 23:34:46 +0000 Subject: [PATCH] Fixes -ggdb3 GNU 'as' incompatiblity - commit to trunk --- configure.ac | 9 +++++++++ libplatform/config.h.in | 4 ---- maintainer/HOWTO-RELEASE.txt | 1 + 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index 4f6f650..2d2c727 100644 --- 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 index f4a130d..956280c 100644 --- a/libplatform/config.h.in +++ b/libplatform/config.h.in @@ -30,10 +30,6 @@ /* Define to 1 if you have the 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 index 67aab22..3945412 100644 --- 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