mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Normalize ENABLE_VALGRIND: TRUE or empty

Browse Source 
Change-Id: I21521d1d7e4a139a1ea0c3f4fe6c51b4637c595f
This commit is contained in:
Tor Lillqvist
2013-10-10 09:55:31 +03:00
parent 85f5f2301d
commit d79f3e6ff0
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
configure.ac
View File

@@ -5524,17 +5524,18 @@ AC_DEFINE_UNQUOTED(SAL_TYPES_ALIGNMENT8,$SAL_TYPES_ALIGNMENT8)
dnl =================================================================== dnl ===================================================================
dnl Check if valgrind headers are available dnl Check if valgrind headers are available
dnl =================================================================== dnl ===================================================================
if test "$cross_compiling" = yes; then ENABLE_VALGRIND=
ENABLE_VALGRIND=FALSE if test "$cross_compiling" != yes; then
else
prev_cppflags=$CPPFLAGS prev_cppflags=$CPPFLAGS
# Is VALGRIND_CFLAGS something one is supposed to have in the environment,
# or where does it come from?
CPPFLAGS="$CPPFLAGS $VALGRIND_CFLAGS" CPPFLAGS="$CPPFLAGS $VALGRIND_CFLAGS"
AC_CHECK_HEADER([valgrind/valgrind.h], AC_CHECK_HEADER([valgrind/valgrind.h],
[ENABLE_VALGRIND=TRUE],[ENABLE_VALGRIND=FALSE]) [ENABLE_VALGRIND=TRUE])
CPPFLAGS=$prev_cppflags CPPFLAGS=$prev_cppflags
fi fi
AC_SUBST([ENABLE_VALGRIND]) AC_SUBST([ENABLE_VALGRIND])
if test "$ENABLE_VALGRIND" = FALSE; then if test -z "$ENABLE_VALGRIND"; then
VALGRIND_CFLAGS= VALGRIND_CFLAGS=
fi fi
AC_SUBST([VALGRIND_CFLAGS]) AC_SUBST([VALGRIND_CFLAGS])

4
python3/ExternalProject_python3.mk
View File

@@ -52,7 +52,7 @@ else
# specific name like build/lib.linux-x86_64-3.3 # specific name like build/lib.linux-x86_64-3.3
python3_cflags = $(ZLIB_CFLAGS) python3_cflags = $(ZLIB_CFLAGS)
ifeq ($(ENABLE_VALGRIND),TRUE) ifneq (,$(ENABLE_VALGRIND))
python3_cflags += $(VALGRIND_CFLAGS) python3_cflags += $(VALGRIND_CFLAGS)
endif endif
@@ -60,7 +60,7 @@ $(call gb_ExternalProject_get_state_target,python3,build) :
$(call gb_ExternalProject_run,build,\ $(call gb_ExternalProject_run,build,\
./configure \ ./configure \
$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
$(if $(filter TRUE,$(ENABLE_VALGRIND)),--with-valgrind) \ $(if $(ENABLE_VALGRIND),--with-valgrind) \
--prefix=/python-inst \ --prefix=/python-inst \
$(if $(filter MACOSX,$(OS)),,--with-system-expat) \ $(if $(filter MACOSX,$(OS)),,--with-system-expat) \
$(if $(filter AIX,$(OS)), \ $(if $(filter AIX,$(OS)), \