external/liborcus/UnpackedTarball_liborcus.mk | 1 +
external/liborcus/version.patch.0 | 11 +++++++++++
2 files changed, 12 insertions(+)
New commits:
commit f7bc83c6c4a74e32fff3180d9053c1e006beb44d
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Thu Oct 4 10:38:40 2018 +0200
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Thu Oct 4 14:23:54 2018 +0200
external/liborcus: Clash between VERSION and trunk libc++ <version>
...on macOS with case-insensitive file systems. When compiling e.g.
workdir/UnpackedTarball/liborcus/src/parser/base64.cpp, libtool adds -I../..
(presumably to find files like workdir/UnpackedTarball/liborcus/config.h),
and
including e.g. <vector> internally includes <version> now, and
workdir/UnpackedTarball/liborcus/VERSION (generated from VERSION.in)
happens to
win. So disable generation of VERSION from VERSION.in (Kohei confirmed in
private communication that that file isn't actually used for anything, so
not
generating it is fine). (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: Id9a6778368796dc2494df3499b5e1ca560df1e56
Reviewed-on: https://gerrit.libreoffice.org/61358
Reviewed-by: Kohei Yoshida <libreoff...@kohei.us>
Tested-by: Jenkins
diff --git a/external/liborcus/UnpackedTarball_liborcus.mk
b/external/liborcus/UnpackedTarball_liborcus.mk
index 215bd4b8cc15..41c89c9e33b1 100644
--- a/external/liborcus/UnpackedTarball_liborcus.mk
+++ b/external/liborcus/UnpackedTarball_liborcus.mk
@@ -19,6 +19,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,liborcus,\
external/liborcus/0001-workaround-a-linking-problem-on-windows.patch \
external/liborcus/rpath.patch.0 \
external/liborcus/gcc9.patch.0 \
+ external/liborcus/version.patch.0 \
))
ifeq ($(OS),WNT)
diff --git a/external/liborcus/version.patch.0
b/external/liborcus/version.patch.0
new file mode 100644
index 000000000000..2c0b5ae4ca07
--- /dev/null
+++ b/external/liborcus/version.patch.0
@@ -0,0 +1,11 @@
+--- configure
++++ configure
+@@ -21055,7 +21055,7 @@
+
+ fi
+
+-ac_config_files="$ac_config_files Makefile
liborcus-$ORCUS_API_VERSION.pc:liborcus.pc.in
liborcus-spreadsheet-model-$ORCUS_API_VERSION.pc:liborcus-spreadsheet-model.pc.in
VERSION include/Makefile include/orcus/Makefile include/orcus/detail/Makefile
include/orcus/mso/Makefile include/orcus/spreadsheet/Makefile src/Makefile
src/liborcus/Makefile src/liborcus/constants.inl src/mso/Makefile
src/parser/Makefile src/python/Makefile src/spreadsheet/Makefile
parser_handlers/Makefile benchmark/Makefile doc_example/Makefile"
++ac_config_files="$ac_config_files Makefile
liborcus-$ORCUS_API_VERSION.pc:liborcus.pc.in
liborcus-spreadsheet-model-$ORCUS_API_VERSION.pc:liborcus-spreadsheet-model.pc.in
include/Makefile include/orcus/Makefile include/orcus/detail/Makefile
include/orcus/mso/Makefile include/orcus/spreadsheet/Makefile src/Makefile
src/liborcus/Makefile src/liborcus/constants.inl src/mso/Makefile
src/parser/Makefile src/python/Makefile src/spreadsheet/Makefile
parser_handlers/Makefile benchmark/Makefile doc_example/Makefile"
+
+ cat >confcache <<\_ACEOF
+ # This file is a shell script that caches the results of configure
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
