[Libreoffice-commits] core.git: configure.ac external/hunspell

[Caolán McNamara]

 configure.ac                                  |    5 +++++
 external/hunspell/ExternalProject_hunspell.mk |   13 +++++++++++++
 2 files changed, 18 insertions(+)

New commits:
commit 2fb74b1ae9fdd0c7b3b69187197895c78bf3c6a7
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Dec 22 13:01:32 2016 +0000

    build hunspell with _GLIBCXX_DEBUG
    
    Change-Id: Ida2ce221f1e35afd946545c2a36b72dd2386e7dd

diff --git a/configure.ac b/configure.ac
index 7146231..8cf2b25 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3877,6 +3877,11 @@ if test -n "$enable_dbgutil" -a "$enable_dbgutil" != "no"; then
     else
         with_system_libgltf=no
     fi
+    if test "$with_system_hunspell" = "yes"; then
+        AC_MSG_ERROR([--with-system-hunspell conflicts with --enable-dbgutil])
+    else
+        with_system_hunspell=no
+    fi
 else
     ENABLE_DBGUTIL=""
     MSVC_USE_DEBUG_RUNTIME=""
diff --git a/external/hunspell/ExternalProject_hunspell.mk b/external/hunspell/ExternalProject_hunspell.mk
index 160f2b1..393031b 100644
--- a/external/hunspell/ExternalProject_hunspell.mk
+++ b/external/hunspell/ExternalProject_hunspell.mk
@@ -13,6 +13,18 @@ $(eval $(call gb_ExternalProject_register_targets,hunspell,\
 	build \
 ))
 
+hunspell_CXXFLAGS=$(CXXFLAGS)
+
+ifneq (,$(filter ANDROID DRAGONFLY FREEBSD IOS LINUX NETBSD OPENBSD,$(OS)))
+ifneq (,$(gb_ENABLE_DBGUTIL))
+hunspell_CXXFLAGS+=-D_GLIBCXX_DEBUG
+endif
+endif
+
+ifneq (,$(debug))
+hunspell_CXXFLAGS+=-g
+endif
+
 $(call gb_ExternalProject_get_state_target,hunspell,build):
 	$(call gb_ExternalProject_run,build,\
 		LIBS="$(gb_STDLIBS) $(LIBS)" \
@@ -20,6 +32,7 @@ $(call gb_ExternalProject_get_state_target,hunspell,build):
 			$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM))\
 			$(if $(filter AIX,$(OS)),CFLAGS="-D_LINUX_SOURCE_COMPAT") \
 			$(if $(filter-out WNTGCC,$(OS)$(COM)),,LDFLAGS="-Wl,--enable-runtime-pseudo-reloc-v2") \
+			CXXFLAGS="$(hunspell_CXXFLAGS)" \
 		&& $(MAKE) \
 	)