external/gpgmepp/UnpackedTarball_gpgmepp.mk | 1 +
external/gpgmepp/version.patch | 4 ++++
2 files changed, 5 insertions(+)
New commits:
commit 689b6a6ceb88b2c074b77c1030bc2396a1816eea
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Thu Oct 4 10:48:28 2018 +0200
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Thu Oct 4 14:24:37 2018 +0200
external/gpgmepp: Clash between VERSION and trunk libc++ <version>
...on macOS with case-insensitive file systems. When compiling e.g.
workdir/UnpackedTarball/gpgmepp/lang/cpp/src/parser/exception.cpp, libtool
adds
-I../../.. (presumably to find files like
workdir/UnpackedTarball/gpgmepp/config.h), and including e.g. <string>
internally includes <version> now, and
workdir/UnpackedTarball/gpgmepp/VERSION
happens to win. So just remove VERSION from the sources, which appears to
not
be needed at least in our build of gpgmepp. (An alternative approach might
have
been to use -iquote../../.. instead of -I../../.., but that's probably hard
to
shoehorn into the libtool-generated compiler invocation.)
Change-Id: Ib1a30a6b825cab208238d17ff384e7900a27047d
Reviewed-on: https://gerrit.libreoffice.org/61359
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/external/gpgmepp/UnpackedTarball_gpgmepp.mk
b/external/gpgmepp/UnpackedTarball_gpgmepp.mk
index e5cce6a0aac4..ed02aa57af35 100644
--- a/external/gpgmepp/UnpackedTarball_gpgmepp.mk
+++ b/external/gpgmepp/UnpackedTarball_gpgmepp.mk
@@ -26,5 +26,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,gpgmepp, \
$(if $(filter LINUX,$(OS)),external/gpgmepp/asan.patch) \
$(if $(filter LINUX,$(OS)),external/gpgmepp/rpath.patch) \
external/gpgmepp/gcc9.patch \
+ external/gpgmepp/version.patch \
))
# vim: set noet sw=4 ts=4:
diff --git a/external/gpgmepp/version.patch b/external/gpgmepp/version.patch
new file mode 100644
index 000000000000..21d3b680c2ac
--- /dev/null
+++ b/external/gpgmepp/version.patch
@@ -0,0 +1,4 @@
+--- VERSION
++++ /dev/null
+@@ -1,1 +0,0 @@
+-1.9.0
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
