2193650b33
...originally started mostly to simplify a then-upcoming change to address
std::bind2nd gone from libc++ for C++17 (which turned out to already be
partially addressed in this new CoinMP revision). But that has since been
addressed with b97e8b9d13 "external/coinmp: Adapt
to std::bind2nd gone from C++17" on top of the old CoinMP 1.7.6, because
updating to 1.8.4 turned out to run into issues on Windows, see the email thread
starting at
<https://lists.freedesktop.org/archives/libreoffice/2022-September/089383.html>
"Maintaining building external/coinmp on Windows".
* <https://dev-www.libreoffice.org/src/CoinMP-1.8.4.tgz> is a copy of
<https://www.coin-or.org/download/source/CoinMP/CoinMP-1.8.4.tgz>.
* Various of our patches are meanwhile addressed upstream, partially or in
whole.
* The upstream configure scripts deteriorated and caused one of my Linux build's
CC=/absolute/path/to/some/clang to be mistaken for MSVC which caused them to
force LD=link, which in turn caused them to only build archives and not the
shared libraries that we expect. external/coinmp/clang-with-path.patch
addresses that.
* There's apparently a new ClpSolver library now that also needs to be
installed. Otherwise at least CppunitTest_sccomp_swarmsolvertest failed due
to
> warn:sal.osl:1950612:1950612:sal/osl/unx/module.cxx:152: dlopen(instdir/program/libsolverlo.so, 257): libClpSolver.so.1: cannot open shared object file: No such file or directory
* Plus modifications to external/coinmp/windows.build.patch.1 thankfully done by
Taichi Haradaguchi <20001722@ymail.ne.jp> to make this actually compile on
Windows (cf. the mailing list thread starting at
<https://lists.freedesktop.org/archives/libreoffice/2022-September/089383.html>
"Maintaining building external/coinmp on Windows")
Change-Id: I498c9513fa0d96d8ae2b9ba4c09dd792340db730
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140057
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
120 lines
3 KiB
Diff
120 lines
3 KiB
Diff
--- Cbc/configure
|
|
+++ Cbc/configure
|
|
@@ -3208,7 +3208,7 @@
|
|
|
|
# Correct the LD variable if we are using the MS or Intel-windows compiler
|
|
case "$CC" in
|
|
- clang* ) ;;
|
|
+ clang* | */clang* ) ;;
|
|
cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
|
|
LD=link
|
|
;;
|
|
@@ -4081,7 +4081,7 @@
|
|
|
|
# correct the LD variable in a build with MS or Intel-windows compiler
|
|
case "$CXX" in
|
|
- clang* ) ;;
|
|
+ clang* | */clang* ) ;;
|
|
cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
|
|
LD=link
|
|
;;
|
|
--- Cgl/configure
|
|
+++ Cgl/configure
|
|
@@ -3174,7 +3174,7 @@
|
|
|
|
# Correct the LD variable if we are using the MS or Intel-windows compiler
|
|
case "$CC" in
|
|
- clang* ) ;;
|
|
+ clang* | */clang* ) ;;
|
|
cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
|
|
LD=link
|
|
;;
|
|
@@ -4045,7 +4045,7 @@
|
|
|
|
# correct the LD variable in a build with MS or Intel-windows compiler
|
|
case "$CXX" in
|
|
- clang* ) ;;
|
|
+ clang* | */clang* ) ;;
|
|
cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
|
|
LD=link
|
|
;;
|
|
--- Clp/configure
|
|
+++ Clp/configure
|
|
@@ -3204,7 +3204,7 @@
|
|
|
|
# Correct the LD variable if we are using the MS or Intel-windows compiler
|
|
case "$CC" in
|
|
- clang* ) ;;
|
|
+ clang* | */clang* ) ;;
|
|
cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
|
|
LD=link
|
|
;;
|
|
@@ -4075,7 +4075,7 @@
|
|
|
|
# correct the LD variable in a build with MS or Intel-windows compiler
|
|
case "$CXX" in
|
|
- clang* ) ;;
|
|
+ clang* | */clang* ) ;;
|
|
cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
|
|
LD=link
|
|
;;
|
|
--- CoinMP/configure
|
|
+++ CoinMP/configure
|
|
@@ -3143,7 +3143,7 @@
|
|
|
|
# Correct the LD variable if we are using the MS or Intel-windows compiler
|
|
case "$CC" in
|
|
- clang* ) ;;
|
|
+ clang* | */clang* ) ;;
|
|
cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
|
|
LD=link
|
|
;;
|
|
@@ -4016,7 +4016,7 @@
|
|
|
|
# correct the LD variable in a build with MS or Intel-windows compiler
|
|
case "$CXX" in
|
|
- clang* ) ;;
|
|
+ clang* | */clang* ) ;;
|
|
cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
|
|
LD=link
|
|
;;
|
|
--- CoinUtils/configure
|
|
+++ CoinUtils/configure
|
|
@@ -3200,7 +3200,7 @@
|
|
|
|
# Correct the LD variable if we are using the MS or Intel-windows compiler
|
|
case "$CC" in
|
|
- clang* ) ;;
|
|
+ clang* | */clang* ) ;;
|
|
cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
|
|
LD=link
|
|
;;
|
|
@@ -4071,7 +4071,7 @@
|
|
|
|
# correct the LD variable in a build with MS or Intel-windows compiler
|
|
case "$CXX" in
|
|
- clang* ) ;;
|
|
+ clang* | */clang* ) ;;
|
|
cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
|
|
LD=link
|
|
;;
|
|
--- Osi/configure
|
|
+++ Osi/configure
|
|
@@ -3172,7 +3172,7 @@
|
|
|
|
# Correct the LD variable if we are using the MS or Intel-windows compiler
|
|
case "$CC" in
|
|
- clang* ) ;;
|
|
+ clang* | */clang* ) ;;
|
|
cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
|
|
LD=link
|
|
;;
|
|
@@ -4845,7 +4845,7 @@
|
|
|
|
# correct the LD variable in a build with MS or Intel-windows compiler
|
|
case "$CXX" in
|
|
- clang* ) ;;
|
|
+ clang* | */clang* ) ;;
|
|
cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
|
|
LD=link
|
|
;;
|