summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2020-08-04 14:34:49 +0200
committerStephan Bergmann <sbergman@redhat.com>2020-08-05 09:49:25 +0200
commit72f01ff8da8ffaad50eebc49182e49dee2aa5877 (patch)
tree74cfb3f34c8394f1f8e30b119a6f83994a2aa31e
parentf2a18401f9e9bda9be043ee442078e31ff567357 (diff)
external/libgpg-error: -Werror,-Wundef (clang-cl)
Change-Id: I7e71411901cc2c09b5d13a5ca451f1981e8a9e44 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100090 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
-rw-r--r--external/libgpg-error/UnpackedTarball_libgpg-error.mk1
-rw-r--r--external/libgpg-error/clang-cl.patch11
2 files changed, 12 insertions, 0 deletions
diff --git a/external/libgpg-error/UnpackedTarball_libgpg-error.mk b/external/libgpg-error/UnpackedTarball_libgpg-error.mk
index af74bb1d07c3..72ff13069c76 100644
--- a/external/libgpg-error/UnpackedTarball_libgpg-error.mk
+++ b/external/libgpg-error/UnpackedTarball_libgpg-error.mk
@@ -21,6 +21,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,libgpg-error, \
external/libgpg-error/w32-build-fixes-4.patch \
$(if $(filter MSC,$(COM)),external/libgpg-error/w32-build-fixes-5.patch) \
$(if $(filter LINUX,$(OS)),external/libgpg-error/libgpgerror-bundled-soname.patch.1) \
+ external/libgpg-error/clang-cl.patch \
))
# vim: set noet sw=4 ts=4:
diff --git a/external/libgpg-error/clang-cl.patch b/external/libgpg-error/clang-cl.patch
new file mode 100644
index 000000000000..3a635c5d8990
--- /dev/null
+++ b/external/libgpg-error/clang-cl.patch
@@ -0,0 +1,11 @@
+--- src/gpg-error.h.in
++++ src/gpg-error.h.in
+@@ -152,7 +152,7 @@
+ /*
+ * GCC feature test.
+ */
+-#if __GNUC__
++#ifdef __GNUC__
+ # define _GPG_ERR_GCC_VERSION (__GNUC__ * 10000 \
+ + __GNUC_MINOR__ * 100 \
+ + __GNUC_PATCHLEVEL__)