RepositoryExternal.mk | 6 ++++--
configure.ac | 3 ---
sal/Library_sal.mk | 5 ++++-
vcl/Library_vcl.mk | 5 +----
vcl/Library_vclplug_gen.mk | 5 +----
5 files changed, 10 insertions(+), 14 deletions(-)
New commits:
commit 3bdb950f5edac0cdb09318cea307b4342a0fd714
Author: Michael Stahl <mst...@redhat.com>
Date: Fri Nov 9 20:20:04 2012 +0100
RepositoryExternal: fix gb_LinkTarget__use_valgrind
... which i've also managed to break, unaware of its existence.
Consolidate 2 different ways to use VALGRIND_CFLAGS.
Change-Id: I245c7a9a2b6bc904a227a15063cf5d8a2f64313c
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 3c0dc3a..782f3e5 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -1527,11 +1527,13 @@ endef
endif # SYSTEM_CURL
-ifneq ($(VALGRIND_CFLAGS),)
+# strip because of gb_SPACE
+ifneq ($(strip $(VALGRIND_CFLAGS)),)
define gb_LinkTarget__use_valgrind
$(call gb_LinkTarget_add_defs,$(1),\
- -DHAVE_VALGRIND_H \
+ -DHAVE_VALGRIND_H \
+ -DHAVE_MEMCHECK_H \
)
$(call gb_LinkTarget_set_include,$(1),\
diff --git a/configure.ac b/configure.ac
index f7bf0f7..c968dc2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5057,9 +5057,6 @@ if test "$cross_compiling" != "yes" -a -n
"$ENABLE_DBGUTIL" -a \
CPPFLAGS=$VALGRIND_CFLAGS
AC_CHECK_HEADER([memcheck.h], [], [VALGRIND_CFLAGS=""])
fi
- if test -n "$VALGRIND_CFLAGS"; then
- VALGRIND_CFLAGS="${VALGRIND_CFLAGS} -DHAVE_MEMCHECK_H=1"
- fi
CPPFLAGS=$prev_cppflags
fi
AC_SUBST([VALGRIND_CFLAGS])
diff --git a/sal/Library_sal.mk b/sal/Library_sal.mk
index 854e95f..51e6d9e 100644
--- a/sal/Library_sal.mk
+++ b/sal/Library_sal.mk
@@ -40,7 +40,6 @@ $(eval $(call gb_Library_set_include,sal,\
))
$(eval $(call gb_Library_add_defs,sal,\
- $(VALGRIND_CFLAGS) \
$(if $(filter $(ALLOC),SYS_ALLOC TCMALLOC JEMALLOC), \
-DFORCE_SYSALLOC \
) \
@@ -60,6 +59,10 @@ $(eval $(call gb_Library_use_libraries,sal,\
$(gb_UWINAPI) \
))
+$(eval $(call gb_Library_use_externals,sal,\
+ valgrind \
+))
+
$(eval $(call gb_Library_use_system_win32_libs,sal,\
advapi32 \
comdlg32 \
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 6b1545a..efb39b8 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -470,10 +470,6 @@ vcl_headless_code=\
vcl/headless/svptext \
vcl/headless/svpvd
-$(eval $(call gb_Library_add_defs,vcl,\
- $(VALGRIND_CFLAGS) \
-))
-
ifeq ($(GUIBASE),unx)
$(eval $(call gb_Library_add_defs,vcl,\
-DSAL_DLLPREFIX=\"$(gb_Library_SYSPRE)\" \
@@ -497,6 +493,7 @@ $(eval $(call gb_Library_use_externals,vcl,\
dbus \
fontconfig \
freetype \
+ valgrind \
x11extensions \
))
endif
diff --git a/vcl/Library_vclplug_gen.mk b/vcl/Library_vclplug_gen.mk
index 38b866c..341b48f 100644
--- a/vcl/Library_vclplug_gen.mk
+++ b/vcl/Library_vclplug_gen.mk
@@ -56,6 +56,7 @@ $(eval $(call gb_Library_use_externals,vclplug_gen,\
graphite \
icule \
icuuc \
+ valgrind \
Xrender \
))
@@ -122,10 +123,6 @@ $(eval $(call gb_Library_add_defs,vclplug_gen,\
))
endif
-$(eval $(call gb_Library_add_defs,vclplug_gen,\
- $(VALGRIND_CFLAGS) \
-))
-
## handle Xinerama
ifneq ($(USE_XINERAMA),NO)
ifneq ($(OS)$(USE_XINERAMA_VERSION),SOLARISXsun)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
