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

[Libreoffice Gerrit user]

 external/libnumbertext/ExternalProject_libnumbertext.mk |    5 -----
 1 file changed, 5 deletions(-)

New commits:
commit 83974316398b0754f1f8b172ddfccf882887d2fe
Author:     Michael Stahl <Michael.Stahl at cib.de>
AuthorDate: Thu Jan 31 13:30:20 2019 +0100
Commit:     Michael Weghorn <m.weghorn at posteo.de>
CommitDate: Thu Jan 31 22:51:35 2019 +0100

    libnumbertext: try to remove some odd stuff from ExternalProject.mk
    
    Why do we need this?
    
    Change-Id: I662402731de9b5c56d05730d31ae59606484ec97
    Reviewed-on: https://gerrit.libreoffice.org/67210
    Tested-by: Jenkins
    Reviewed-by: László Németh <nemeth at numbertext.org>
    (cherry picked from commit 67411db4517f38b9c0283717b52ece141ff49ed1)
    Reviewed-on: https://gerrit.libreoffice.org/67217
    Reviewed-by: Michael Weghorn <m.weghorn at posteo.de>

diff --git a/external/libnumbertext/ExternalProject_libnumbertext.mk b/external/libnumbertext/ExternalProject_libnumbertext.mk
index b12012e16577..87278c38fe16 100644
--- a/external/libnumbertext/ExternalProject_libnumbertext.mk
+++ b/external/libnumbertext/ExternalProject_libnumbertext.mk
@@ -24,13 +24,8 @@ libnumbertext_CPPFLAGS+=-D_GLIBCXX_DEBUG
 endif
 endif
 
-libnumbertext_LIBS+=-L$(gb_StaticLibrary_WORKDIR)
-
 $(call gb_ExternalProject_get_state_target,libnumbertext,build):
 	$(call gb_ExternalProject_run,build,\
-		$(if $(libnumbertext_LIBS),LIBS='$(libnumbertext_LIBS)') \
-		$(if $(filter iOS MACOSX,$(OS)),ACLOCAL="aclocal -I $(SRCDIR)/m4/mac") \
-		autoreconf && \
 		LIBS="$(gb_STDLIBS) $(LIBS)" \
 		$(SHELL) ./configure --disable-shared --with-pic \
 			$(if $(verbose),--disable-silent-rules,--enable-silent-rules) \