From c4b9053e16ba1ed9f9e448792cc395a29f9f8fb2 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Wed, 8 Aug 2007 22:06:47 +0000 Subject: [PATCH] Make it work regardless of --enable-debug svn path=/trunk/; revision=5683 --- ChangeLog | 6 ++++++ glib/Makefile.am | 1 + glib/abicheck.sh | 2 +- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 34a17555..b9458323 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2007-08-08 Matthias Clasen + + * glib/glib.symbols: + * glib/Makefile.am: + * glib/abicheck.sh: Make it work regardless of --enable-debug + 2007-08-08 Tristan Van Berkom * docs/reference/gobject/tmpl/gparamspec.sgml: Fixed minor typo in docs. diff --git a/glib/Makefile.am b/glib/Makefile.am index b1f8cc6f..22ecd191 100644 --- a/glib/Makefile.am +++ b/glib/Makefile.am @@ -36,6 +36,7 @@ galiasdef.c: glib.symbols if OS_LINUX if HAVE_GNUC_VISIBILITY +TESTS_ENVIRONMENT = GLIB_DEBUG_FLAGS="$(GLIB_DEBUG_FLAGS)" TESTS = abicheck.sh pltcheck.sh endif endif diff --git a/glib/abicheck.sh b/glib/abicheck.sh index 3e696850..ce9a9667 100755 --- a/glib/abicheck.sh +++ b/glib/abicheck.sh @@ -3,7 +3,7 @@ egrep '^#([^i]|if).*[^\]$' "${top_builddir:-..}/glibconfig.h" > glibconfig.cpp INCLUDES="-include ${top_builddir:-..}/config.h" -INCLUDES="$INCLUDES -include glibconfig.cpp" +INCLUDES="$INCLUDES -include glibconfig.cpp $GLIB_DEBUG_FLAGS" cpp -P -DINCLUDE_INTERNAL_SYMBOLS -DINCLUDE_VARIABLES -DG_STDIO_NO_WRAP_ON_UNIX -DALL_FILES $INCLUDES "${srcdir:-.}/glib.symbols" | sed -e '/^$/d' -e 's/ G_GNUC.*$//' -e 's/ PRIVATE$//' | sort > expected-abi rm -f glibconfig.cpp -- 2.34.1