[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - external/libnumbertext

[Libreoffice Gerrit user]

 external/libnumbertext/ExternalProject_libnumbertext.mk |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit dbe0b3f46baed6e226b3835a3017b9610d46470b
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Thu Dec 6 15:31:13 2018 +0100
Commit:     Michael Stahl <Michael.Stahl at cib.de>
CommitDate: Wed Dec 12 16:39:45 2018 +0100

    Typo causing external/libnumbertext to always use $(gb_COMPILERNOOPTFLAGS)
    
    ...ever since f1579d3d6c5f5f3a651825e035b93bee7a4f43c6 "tdf#117171 support
    localized number name numbering styles"
    
    Change-Id: I93dcfa9f1310b35e3068a7e0efdce258364a7d78
    Reviewed-on: https://gerrit.libreoffice.org/64720
    Reviewed-by: László Németh <nemeth at numbertext.org>
    Tested-by: László Németh <nemeth at numbertext.org>
    Tested-by: Jenkins
    (cherry picked from commit 82af7584dcfe78b2242b3611bc00375871093189)
    Reviewed-on: https://gerrit.libreoffice.org/64744
    Reviewed-by: Michael Stahl <Michael.Stahl at cib.de>

diff --git a/external/libnumbertext/ExternalProject_libnumbertext.mk b/external/libnumbertext/ExternalProject_libnumbertext.mk
index c36336ae52bf..d3ec1266e382 100644
--- a/external/libnumbertext/ExternalProject_libnumbertext.mk
+++ b/external/libnumbertext/ExternalProject_libnumbertext.mk
@@ -37,7 +37,7 @@ $(call gb_ExternalProject_get_state_target,libnumbertext,build):
 			$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM))\
 			$(if $(filter AIX,$(OS)),CFLAGS="-D_LINUX_SOURCE_COMPAT") \
 			$(if $(libnumbertext_CPPFLAGS),CPPFLAGS='$(libnumbertext_CPPFLAGS)') \
-			CXXFLAGS="$(libnumbertext_CXXFLAGS) $(if $(ENABLE_OPTIMIZED) $(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS)) $(if $(debug),$(gb_DEBUGINFO_FLAGS) $(gb_DEBUG_CXXFLAGS)) $(gb_VISIBILITY_FLAGS) $(gb_VISIBILITY_FLAGS_CXX)" \
+			CXXFLAGS="$(libnumbertext_CXXFLAGS) $(if $(ENABLE_OPTIMIZED),$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS)) $(if $(debug),$(gb_DEBUGINFO_FLAGS) $(gb_DEBUG_CXXFLAGS)) $(gb_VISIBILITY_FLAGS) $(gb_VISIBILITY_FLAGS_CXX)" \
 		&& cd src && $(MAKE) \
 	)