f7bc83c6c4
...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 <libreoffice@kohei.us> Tested-by: Jenkins
11 lines
1.2 KiB
Text
11 lines
1.2 KiB
Text
--- 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
|