d400009e7c
seen upstream & removed here: - external/gpgmepp/add-gpgme_set_global_flag-wrapper.patch - external/gpgmepp/version.patch - external/libgpg-error/clang-cl.patch - external/libgpg-error/libgpg-error_gawk5.patch Change-Id: Iea2b681fa839ae55cb954c2ad3edf4291b149dbe Reviewed-on: https://gerrit.libreoffice.org/c/core/+/61322 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
31 lines
1.4 KiB
Groff
31 lines
1.4 KiB
Groff
diff -ru libgpg-error.orig/src/Makefile.in libgpg-error/src/Makefile.in
|
|
--- libgpg-error.orig/src/Makefile.in 2017-09-12 08:18:29.376536700 +0200
|
|
+++ libgpg-error/src/Makefile.in 2017-09-12 08:57:11.648083800 +0200
|
|
@@ -512,8 +512,7 @@
|
|
@HAVE_W32_SYSTEM_TRUE@arch_sources = w32-gettext.c w32-lock.c w32-lock-obj.h w32-thread.c \
|
|
@HAVE_W32_SYSTEM_TRUE@ w32-iconv.c w32-estream.c w32-reg.c spawn-w32.c
|
|
|
|
-@HAVE_W32_SYSTEM_TRUE@RCCOMPILE = $(RC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
|
|
-@HAVE_W32_SYSTEM_TRUE@ -DLOCALEDIR=\"$(localedir)\" $(AM_CPPFLAGS) $(CPPFLAGS)
|
|
+@HAVE_W32_SYSTEM_TRUE@RCCOMPILE = $(RC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) -DLOCALEDIR=$(localedir) $(AM_CPPFLAGS)
|
|
|
|
@HAVE_W32_SYSTEM_TRUE@LTRCCOMPILE = $(LIBTOOL) --mode=compile --tag=RC $(RCCOMPILE)
|
|
@HAVE_W32_SYSTEM_TRUE@SUFFIXES = .rc .lo
|
|
@@ -1242,7 +1241,7 @@
|
|
|
|
|
|
@HAVE_W32_SYSTEM_TRUE@.rc.lo:
|
|
-@HAVE_W32_SYSTEM_TRUE@ $(LTRCCOMPILE) -i "$<" -o "$@"
|
|
+@HAVE_W32_SYSTEM_TRUE@ $(LTRCCOMPILE) -i $< -o $@
|
|
|
|
@HAVE_W32_SYSTEM_TRUE@versioninfo.lo : gpg-error.w32-manifest
|
|
|
|
@@ -1283,7 +1282,7 @@
|
|
# It is correct to use $(CPP). We want the host's idea of the error codes.
|
|
mkerrcodes.h: Makefile mkerrcodes.awk $(gpg_extra_headers)
|
|
$(AWK) -f $(srcdir)/mkerrcodes1.awk $(srcdir)/errnos.in >_$@
|
|
- $(CPP) $(CPPFLAGS) $(extra_cppflags) -P _$@ | grep GPG_ERR_ | \
|
|
+ $(CPP) $(CPPFLAGS) $(extra_cppflags) _$@ | grep GPG_ERR_ | \
|
|
$(AWK) -f $(srcdir)/mkerrcodes.awk >$@
|
|
-rm _$@
|
|
|