[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - external/libnumbertext
Christian Lohmaier
lohmaier+LibreOffice at googlemail.com
Sun Jul 1 13:07:31 UTC 2018
external/libnumbertext/ExternalProject_libnumbertext.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit bda21b487f4899fb42ff24515b27e2344ccf9a50
Author: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
Date: Sat Jun 30 08:41:01 2018 +0200
libnumbertext: off-by-one in makefile rule (LIB=.. ineffective)
autoreconf line doesn't need it, it is the configure one that should
make use of it..
Change-Id: I1d7b492a8d99f8fbcb8443de7a7def2caaf8df3b
Reviewed-on: https://gerrit.libreoffice.org/56745
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
(cherry picked from commit 044b73b2adcbd739a186ddaea5830db7ff605f09)
Reviewed-on: https://gerrit.libreoffice.org/56748
diff --git a/external/libnumbertext/ExternalProject_libnumbertext.mk b/external/libnumbertext/ExternalProject_libnumbertext.mk
index 9320c62dcfee..c36336ae52bf 100644
--- a/external/libnumbertext/ExternalProject_libnumbertext.mk
+++ b/external/libnumbertext/ExternalProject_libnumbertext.mk
@@ -30,8 +30,8 @@ $(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") \
- LIBS="$(gb_STDLIBS) $(LIBS)" \
autoreconf && \
+ LIBS="$(gb_STDLIBS) $(LIBS)" \
$(SHELL) ./configure --disable-shared --with-pic \
$(if $(verbose),--disable-silent-rules,--enable-silent-rules) \
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM))\
More information about the Libreoffice-commits
mailing list