[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - external/libassuan

[Stephan Bergmann]

 external/libassuan/ExternalProject_libassuan.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit f6c4eb3cafe475dc96bb582cce42ec901b785d4b
Author: Stephan Bergmann 
Date:   Mon Nov 27 15:19:47 2017 +0100

Pass $(verbose) into ExternalProject_libassuan

Change-Id: I66771b49933a9092ad0c07c5ebaabfb3d80dcdcd
Reviewed-on: https://gerrit.libreoffice.org/45343
Tested-by: Jenkins 
Reviewed-by: Stephan Bergmann 
(cherry picked from commit d5f8b759b836268d414fc05f682e4412c6c93f5a)
Reviewed-on: https://gerrit.libreoffice.org/45370
Reviewed-by: Thorsten Behrens 
Tested-by: Thorsten Behrens 

diff --git a/external/libassuan/ExternalProject_libassuan.mk 
b/external/libassuan/ExternalProject_libassuan.mk
index 9f0bccdbf64a..21d034455dca 100644
--- a/external/libassuan/ExternalProject_libassuan.mk
+++ b/external/libassuan/ExternalProject_libassuan.mk
@@ -26,6 +26,7 @@ $(call gb_ExternalProject_get_state_target,libassuan,build):
&& ./configure \
--enable-static \
--disable-shared \
+   $(if $(verbose),--disable-silent-rules,--enable-silent-rules) \
CXXFLAGS="$(CXXFLAGS)" \
GPG_ERROR_CFLAGS="$(GPG_ERROR_CFLAGS)" \
GPG_ERROR_LIBS="$(GPG_ERROR_LIBS)" \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - external/libassuan

[Stephan Bergmann]

 external/libassuan/w32-build-fixes.patch.1 |   11 +++
 1 file changed, 11 insertions(+)

New commits:
commit dd71a8e35c21496687a4c73b0f6641210252cbee
Author: Stephan Bergmann 
Date:   Mon Nov 27 15:20:29 2017 +0100

Missing --tag=RC

...causing failure

> make[5]: Entering directory 'workdir/UnpackedTarball/libassuan/src'
> C:/cygwin64/bin/sh.exe ../libtool --mode=compile windres 
--preprocessor=[...]' `echo -DHAVE_CONFIG_H -I. -I..  | sed -e 
's/-I/--include-dir /g;s/-D/--define /g'` -i versioninfo.rc -o versioninfo.lo
> libtool: compile: unable to infer tagged configuration
> libtool: compile: specify a tag with `--tag'
> make[5]: *** [Makefile:1172: versioninfo.lo] Error 1

for me.  (And note how e.g. 
workdir/UnpackedTarball/libgpg-error/src/Makefile.am
contains such a --tag=RC, too.)

Change-Id: I3919a59d5443c558d9bc37fd0a851ea161f44406
Reviewed-on: https://gerrit.libreoffice.org/45344
Tested-by: Jenkins 
Reviewed-by: Stephan Bergmann 
(cherry picked from commit b00ba26c56c9f910a1a65f39a886ca23def34341)
Reviewed-on: https://gerrit.libreoffice.org/45371
Reviewed-by: Thorsten Behrens 
Tested-by: Thorsten Behrens 

diff --git a/external/libassuan/w32-build-fixes.patch.1 
b/external/libassuan/w32-build-fixes.patch.1
index f8125496f6ad..9b5c78f1c10f 100755
--- a/external/libassuan/w32-build-fixes.patch.1
+++ b/external/libassuan/w32-build-fixes.patch.1
@@ -1,3 +1,14 @@
+--- libassuan/src/Makefile.am
 libassuan/src/Makefile.am
+@@ -81,7 +81,7 @@
+ 
+ if HAVE_W32_SYSTEM
+ 
+-LTRCCOMPILE = $(LIBTOOL) --mode=compile $(RC) \
++LTRCCOMPILE = $(LIBTOOL) --mode=compile --tag=RC $(RC) \
+  `echo $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) | \
+  sed -e 's/-I/--include-dir /g;s/-D/--define /g'`
+ 
 --- libassuan.orig/src/mkheader.c  2013-03-15 20:26:09.0 +0100
 +++ libassuan/src/mkheader.c   2017-09-24 14:17:33.584583300 +0200
 @@ -99,7 +99,7 @@
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits