[Mesa-dev] [PATCH] mesa: Have configure define NDEBUG, not mtypes.h.
mtypes.h had been defining NDEBUG (used by assert) if DEBUG was not defined. Confusing and bizarre that you don't get NDEBUG if you don't include mtypes.h. ... which is just what happened in commit bef38f62e. Let's let configure define this for us if not using --enable-debug. --- configure.ac | 2 ++ src/mesa/main/mtypes.h | 3 --- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index beb7a7d..5fbb7bc 100644 --- a/configure.ac +++ b/configure.ac @@ -370,6 +370,8 @@ if test x$enable_debug = xyes; then CXXFLAGS=$CXXFLAGS -O0 fi fi +else + DEFINES=$DEFINES -DNDEBUG fi dnl diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h index 05b5a81..6e99773 100644 --- a/src/mesa/main/mtypes.h +++ b/src/mesa/main/mtypes.h @@ -4512,9 +4512,6 @@ extern int MESA_DEBUG_FLAGS; # define MESA_VERBOSE 0 # define MESA_DEBUG_FLAGS 0 # define MESA_FUNCTION a function -# ifndef NDEBUG -# define NDEBUG -# endif #endif -- 2.0.5 ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] [PATCH] mesa: Have configure define NDEBUG, not mtypes.h.
On Friday, February 20, 2015 12:44:53 PM Matt Turner wrote:
mtypes.h had been defining NDEBUG (used by assert) if DEBUG was not
defined. Confusing and bizarre that you don't get NDEBUG if you don't
include mtypes.h.
... which is just what happened in commit bef38f62e.
Let's let configure define this for us if not using --enable-debug.
---
configure.ac | 2 ++
src/mesa/main/mtypes.h | 3 ---
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/configure.ac b/configure.ac
index beb7a7d..5fbb7bc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -370,6 +370,8 @@ if test x$enable_debug = xyes; then
CXXFLAGS=$CXXFLAGS -O0
fi
fi
+else
+ DEFINES=$DEFINES -DNDEBUG
fi
dnl
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index 05b5a81..6e99773 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -4512,9 +4512,6 @@ extern int MESA_DEBUG_FLAGS;
# define MESA_VERBOSE 0
# define MESA_DEBUG_FLAGS 0
# define MESA_FUNCTION a function
-# ifndef NDEBUG
-# define NDEBUG
-# endif
#endif
It looks like scons/gallium.py already defines DEBUG and NDEBUG:
cppdefines = []
if env['build'] in ('debug', 'checked'):
cppdefines += ['DEBUG']
else:
cppdefines += ['NDEBUG']
So this may not even break the SCons build. If it does, there's a
fairly clear solution there.
Reviewed-by: Kenneth Graunke kenn...@whitecape.org
signature.asc
Description: This is a digitally signed message part.
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] [PATCH] mesa: Have configure define NDEBUG, not mtypes.h.
On Fri, Feb 20, 2015 at 12:44 PM, Matt Turner matts...@gmail.com wrote: mtypes.h had been defining NDEBUG (used by assert) if DEBUG was not defined. Confusing and bizarre that you don't get NDEBUG if you don't include mtypes.h. ... which is just what happened in commit bef38f62e. Let's let configure define this for us if not using --enable-debug. --- Scons will probably need similar treatment. ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
