diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2017-11-27 15:20:29 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2017-11-27 22:58:40 +0100 |
| commit | b00ba26c56c9f910a1a65f39a886ca23def34341 (patch) | |
| tree | 380fdadb0527f9bf061a1b30f38947f8cddf1f6c | |
| parent | d5f8b759b836268d414fc05f682e4412c6c93f5a (diff) | |
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 <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
| -rwxr-xr-x | external/libassuan/w32-build-fixes.patch.1 | 11 |
1 files changed, 11 insertions, 0 deletions
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.000000000 +0100 +++ libassuan/src/mkheader.c 2017-09-24 14:17:33.584583300 +0200 @@ -99,7 +99,7 @@ |