summaryrefslogtreecommitdiff
path: root/external/coinmp
AgeCommit message (Collapse)Author
2020-02-16GBUILD_TRACE, support for finding out where the build time is spentLuboš Luňák
See instructions in solenv/gbuild/Trace.mk . This generates a file than can be viewed e.g. in the Chromium tracing view. Change-Id: I5f90647c58ca729375525b6daed2d4918adc8188 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88754 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
2020-02-10Mark external/coinmp/Wnon-c-typedef-for-linkage.patch as upstreamedStephan Bergmann
Change-Id: I8c2a7ce17d1c406563aca234aa6ea606414c9f71 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88363 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2020-02-10external/coinmp: -Werror,-Wnon-c-typedef-for-linkageStephan Bergmann
...with recent Clant trunk, see <https://github.com/llvm/llvm-project/commit/ 7ae1b4a0ce9c7f269cf3069e41496a78e3f28d49> "Implement P1766R1: diagnose giving non-C-compatible classes a typedef name for linkage purposes." Change-Id: I3c72f0e4c2f04dd197fb8af1581cd03f465cd87d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88352 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2019-11-01coinmp: disable "glpk", whatever that isMichael Stahl
On Fedora 31, this happens in CppunitTest_sccomp_solver: - loading component library <file:///work/lo/master/instdir/program/libsolverlo.so> failed > nm -D instdir/program/libCbcSolver.so.3 | grep cbc_glp_prob U cbc_glp_prob > grep -r COIN_HAS_GLPK workdir/UnpackedTarball/coinmp | grep config.h workdir/UnpackedTarball/coinmp/Osi/src/Osi/config.h:/* #undef COIN_HAS_GLPK */ workdir/UnpackedTarball/coinmp/Clp/src/config.h.in:#undef COIN_HAS_GLPK workdir/UnpackedTarball/coinmp/Cbc/src/config.h:#define COIN_HAS_GLPK 1 workdir/UnpackedTarball/coinmp/CoinUtils/src/config.h.in:#undef COIN_HAS_GLPK Somehow 2 different configures in coinmp got different ideas about whether something named "glpk" is available.... no idea what that is, it looks like there's a "glpk-devel" package installed on the system, and i doubt that a dependency on that would be desirable. Change-Id: Ief01b6aedc692197c1a8fd6351aef4281e530e70 Reviewed-on: https://gerrit.libreoffice.org/81863 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de>
2019-04-16Initial VS 2019 SupportTomoyuki Kubota
Change-Id: I8e08efb549ebd52c37183a1185d6de73f2b00601 Reviewed-on: https://gerrit.libreoffice.org/64630 Reviewed-by: himajin100000 <himajin100000@gmail.com> Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> Tested-by: Michael Stahl <Michael.Stahl@cib.de>
2019-01-16Minimum Supported Version is VS2017himajin100000
Change-Id: Id771f1fe0d8c6702a52836f6229a944d259fed4c Reviewed-on: https://gerrit.libreoffice.org/66424 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
2018-12-11Extend libtool RPATH outsmarting hack to external/coinmp's CoinUtilsStephan Bergmann
(See 1d028d4783da69c5c0e6e0b59e0f8ac55eb9d2b1 "Fix Linux RPATH of various external modules" for the original external/coinmp/rpath.patch missing a patch for CoinUtils/configure.) This is a blind fix attempt for <https://ci.libreoffice.org/job/lo_daily_update_gandalf/559/console> > /lo/home/tdf/lode/jenkins/workspace/lo_daily_update_gandalf/instdir/program/libCoinUtils.so.3 has unexpected RPATH 0x000000000000001d (RUNPATH) Library runpath: [/opt/rh/devtoolset-7/root/usr/lib/../lib64:$ORIGIN] > /lo/home/tdf/lode/jenkins/workspace/lo_daily_update_gandalf/postprocess/CustomTarget_check_dynamic_objects.mk:20: recipe for target '/lo/home/tdf/lode/jenkins/workspace/lo_daily_update_gandalf/workdir/CustomTarget/postprocess/check_dynamic_objects/check.done' failed after ed81fe44d4e6b36c4c61a22e9e28a3a94fef9238 "Enabling Developer Toolset 7 for Jenkins' remaining GCC master jobs" enabled GCC 8 at gandalf's /opt/rh/devtoolset-7/root/ (which is at the same location as a CentOS Developer Toolset 7 special GCC 7, but is actually a plain GCC 8, cf. <https://lists.freedesktop.org/archives/libreoffice/2018-December/081544.html> "Re: Compiler baselines") for the lo_daily_update_gandalf job. Presumably libtool added to RPATH a path to find that GCC 8 installation's /opt/rh/devtoolset-7/root/usr/lib64/libstdc++.so.6. Change-Id: I37c98faffe3e6c014e321b756a18a8468c32877c Reviewed-on: https://gerrit.libreoffice.org/64942 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2018-01-08coinmp: link with /DYNAMICBASEMichael Stahl
No idea why this would be explicitly disabled. Change-Id: I1e06544ae4ae579de578560ce66e310da659ccb4
2017-10-28use predefined workdir pathDavid Tardon
Change-Id: Ia14aaba92e5d36064bc6a77dbc63463a833d8745 Reviewed-on: https://gerrit.libreoffice.org/43969 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
2017-10-04use the new gbuild way to update config.*David Tardon
Change-Id: I43805ac8c3d5c1b65519da02c3cc50fdb9729ea6 Reviewed-on: https://gerrit.libreoffice.org/42941 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: David Tardon <dtardon@redhat.com>
2017-09-06corrected commit 397e2f0cfb310ac606705c74e5907195e5ca7872jan Iversen
that commit removed all iOS patches for CoinMP, they are still needed. Updated the iOS.patch.1 to the patches config.sub(s) Change-Id: Id69b436c85d5f3b7113522404f47872559896dd6
2017-09-06external/coinmp: Update config.{guess,sub}Stephan Bergmann
...with versions of those files from the latest <http://ftp.gnu.org/gnu/automake/automake-1.15.tar.xz>. The current versions failed for a Flathub aarch64 test build, see <https://flathub.org/builds/#/builders/6/builds/274>. Some existing patches already did local modifications to those config.{guess,sub} files, apparently to address build issues on Android, iOS, and macOS. I removed all of them, hoping that the latest versions of the files already address all those issues. Change-Id: I13e58479d4e3a0598a00c69674885ca540092b53 Reviewed-on: https://gerrit.libreoffice.org/41987 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2017-07-13Pass verbose=true into external/coinmpStephan Bergmann
Change-Id: If8e0d3e7205737a1e15c563527d3845c7ae93dc1
2017-06-11iOS, solved coinmp buildbreakerjan Iversen
Patch was added in wrong sequence. Change-Id: I4d700d0f9591dbb43c738ef69f823488b9c3162c
2017-06-11iOS, coinmp patch (addon)jan Iversen
support for arm64, in submodules as well Change-Id: Idc13b03d2fcc9bcf11fe4dadc0fc298a9871848f
2017-06-11iOS coinmp patchjan Iversen
add support for arm64 Change-Id: I76dc00058abd27b8e022ffcd0d68ff00446ebeb6
2017-05-30sal,external: remove checks for obsolete VCVER=120Michael Stahl
Change-Id: I4d32b7c4b2e545a8d979bc516f64cfcbf66ecd07
2017-05-02Make some externals' libtool copies cope with -mllvmStephan Bergmann
...as needed e.g. for <https://bugs.llvm.org/show_bug.cgi?id=32349> "r294897 + NewGVN cause build failure with LibreOffice", by applying <http://git.savannah.gnu.org/cgit/libtool.git/commit/ ?id=d9a35fe9d3508b5c0d56e7f2ec80fc05e8415fa3> "libtool: Discard '-mllvm $arg' options when linking." Change-Id: Id2afc3c8af3c6c9595e7cb33cef5084a74f78cb0
2017-04-21gbuild: Remove MSVC 2013 legacy codeDavid Ostrovsky
Uwinapi is discontinued. Change-Id: I063b4d0d8fab2d60de168e960a63b8181158ac01 Reviewed-on: https://gerrit.libreoffice.org/23198 Reviewed-by: David Ostrovsky <david@ostrovsky.org> Tested-by: David Ostrovsky <david@ostrovsky.org>
2017-02-22MSVC 14.0: Make it work with older SDK versionDavid Ostrovsky
Change-Id: I50a9e8b122250af445c2a1b3d0941d508e027318 Reviewed-on: https://gerrit.libreoffice.org/34528 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: David Ostrovsky <david@ostrovsky.org>
2017-02-21Fix check for non-empty UCRTVERSIONStephan Bergmann
...introduced with b862cbdd345ec57c2595629ded6a3969e1e65d56 "Support MSVC 15.0", but $(filter ...,) always expands to the empty string, and this is probably what was intended. Change-Id: I5865ea13ba3c3d52402bcba48f4f770f6c2b8862 Reviewed-on: https://gerrit.libreoffice.org/34482 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2017-02-15Support MSVC 15.0David Ostrovsky
New compiler changes quite some stuff: * Compiler detection done based on different registry key * .NET SDK detection done based on different registry key * Msbuild installation directory changed * Merge modules installation directory changed * SDK number in registry doesn't match the directory name: (registry key: 10.0.14393, directory name: 10.0.14393.0) * Compiler, include and library location directories changed * Architecture specific directory changed: x64 instead of amd64 * Compiler own include directory must be added with -I option * To force usage of SDK 10 (8.1 is selected per default) new switch WindowsTargetPlatformVersion is passed to msbuild, to avoid patching VC project files with this line: <WindowsTargetPlatformVersion><SDK>/WindowsTargetPlatformVersion> Known issues: * Firebird is broken: http://paste.openstack.org/show/594333 Change-Id: I148d7932aff43bbbd07bd493504df974726234c2 Reviewed-on: https://gerrit.libreoffice.org/31279 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: David Ostrovsky <david@ostrovsky.org>
2016-11-17chmod -xTor Lillqvist
Change-Id: Ie07ef2f9e9f6d0b31b513afa913b79d9c641e4f1
2016-09-21coinmp: no need for bzip2 libraryMichael Stahl
Change-Id: I1f5115defa3619f13ce00d64d5532d2b08dc2ccb
2016-07-01remove executable bit from .mk filesMichael Stahl
Change-Id: Id79898bb4f71103830ad7f74da71fbd5102e4fb5
2016-03-03Fix coinmp on MSVC 14.0David Ostrovsky
Iterator category tags carry information that can be used to select the most efficient algorithms for the specific requirement set that is implied by the category. OsiCuts defines bidirectional category tag, but doesn't implement operator--(). This is illegal: [1]. * [1] http://paste.openstack.org/show/489235 Change-Id: I68a6d297d5c33848c4b8a324e081c5118fd936a4 Reviewed-on: https://gerrit.libreoffice.org/22882 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Jenkins <ci@libreoffice.org>
2015-09-09externals: remove various obsolete MSVC2012 specific flagsMichael Stahl
Change-Id: I8848d042a008c21e407d9610161b5c67d2137a18
2015-09-02Fix coinmp on MSVC 14.0David Ostrovsky
Change-Id: I59372b51ce4aef2e4a923787db61e20cfd96a9fa Reviewed-on: https://gerrit.libreoffice.org/17342 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2015-06-12Fix Linux RPATH of various external modulesStephan Bergmann
...as discussed in 371cc81bd9ccbfbed25f810e70899c044280349e "external/liborcus: Fix Linux RPATH:" * When an external module produces multiple libraries (that we all install) that depend on each other, they need to contain $ORIGIN in RPATH (strictly speaking, those that do not depend on any other libraries from the module would not need that, but it is harmless and easier to do that way). * When an external module's libraries depend on other external modules' libraries, and (at least some of) those other external modules are not configuread as --with-system-*, they need to contain $ORIGIN in RPATH (again, for simplicity, some libraries may get that even if they would not strictly need it). * Try to outsmart the external modules' libtool instances to not add (ultimately bogus) paths to RPATH for dependencies on libraries from external modules (either from the same module, or from anohter module not configured as --with-system-*). The only time we do not outsmart libtool, and instead rely on it (hopefully?) doing the right thing is when a given external modules' libraries depend on libraries from excatly one other external module, and the latter is configured as --with-system-*. * That outsmarting means that if an external library depends both on external libraries provided by modules not configured as --with-system-* (so RPATH contains $ORIGIN, and the outsmarting is not suppressed) and on external libraries provided by modules configured as --with-system-*: Then if the latter are in unusual locations on the system that would require an RPATH entry (which might be provided via the corresponding "pkg-config --libs", say, and presumably would be honoured by libtool if we did not outsmart it), then those paths are now erroneously missing from RPATH. * That outsmarting also causes linking of some utility applications in module redland to fail, but those are ultimately unused, so cut them off by patching their respective sub-directory Makefile.in. Change-Id: Iec05b3568fbcf04987018322c328b769ae4f5dab
2015-06-02external/coinmp: -fsanitize=nonnull-attributeStephan Bergmann
Change-Id: I487e772395defa9aae2ce3eb040b8c7d92720cb2
2015-03-16external/coinmp: Work around -Werror,-Wformat-pedanticStephan Bergmann
Clang trunk since r231211 with -pedantic-errors now emits "Cbc_C_Interface.cpp:379:55: error: format specifies type 'void *' but the argument has type 'char *' [-Werror,-Wformat-pedantic]" Change-Id: I5d410068f1cd82334f26148df30a45dbc9eabd0a
2015-01-29tdf#80370: Fix Mac OS X install names of external/{coinmp,lpsolve}Stephan Bergmann
Change-Id: I240c8c940d7d3e1310c4ee33911e8c7019e67060
2015-01-08coinmp: Don't hard code Win32 platform on WindowsDavid Ostrovsky
Change-Id: I39eafa22b12e62c766a182c2ebc2b115084f4cef Reviewed-on: https://gerrit.libreoffice.org/13231 Reviewed-by: David Ostrovsky <david@ostrovsky.org> Tested-by: David Ostrovsky <david@ostrovsky.org>
2014-11-19coinmp: conditional patchRobert Antoni Buj i Gelonch
Change-Id: I33927632173d422d04771f550721dba1767cded5 Reviewed-on: https://gerrit.libreoffice.org/12040 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-10-02fdo#82430: MSVC build: avoid using SSE2 instructions in some externalsMichael Stahl
Hopefully this should fix up the most important external libraries. Change-Id: I744cb5a2ce7fafb10852059050cf24589d6ca400
2014-09-17Bye bye VS2010Tor Lillqvist
Change-Id: I9d16f4f0df42ae4b046bc1e4ac4fba95c4b9d785
2014-08-09VS2013: Override ToolsVersion settingThomas Arnhold
Otherwise those external projects will fail, because with only VS2013 installed there is no ToolsVersion 4.0 (which is set inside the VC projects files). http://msdn.microsoft.com/en-us/library/bb383985.aspx Change-Id: I144ba1ef95372226ebadb082e3a78155cca316fd
2014-08-07fix external/coinmp on OSX: bad symlinkingDouglas Mencken
instdir/LibreOfficeDev.app/Contents/MacOS/libCbc.3.dylib -> libCbc.3.8.8.dylib (which does not exist) See also: 9f339a89453808b917177a3ee675a76385758902 Change-Id: I398d649c2e918b496c9b92364189da4796682653 Reviewed-on: https://gerrit.libreoffice.org/10614 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
2014-07-29Make coinmp build with VS2013Tor Lillqvist
Add a patch to mangle the project files a bit so that they work better on a machine with only VS2013 installed. At least in my case. But why we still need to *also* have those /p:PlatformToolset=v120 /p:VisualStudioVersion=12.0 in the ExternalProject_coinmp.mk I don't know. Change-Id: Ieebd729c3ba89cf22231fb943f3739d6be5c7acd
2014-07-14coinmp: macosx.build.patchrbuj
Fix UNAME_PROCESSOR detection in Mac OS X. Add a filter expression before to apply a platform-specific patch. Change-Id: I9fc4cf790f16255f4e807e070dbae0e5a1f28781 Reviewed-on: https://gerrit.libreoffice.org/10227 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-07-11VS2013: Adjust coinmp to 12.0 vcproj versionDavid Ostrovsky
Change-Id: I3b069278297c489b0aeb54ebef484c73dee503c0 Reviewed-on: https://gerrit.libreoffice.org/10158 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2014-06-06coverity#1202902 Uncaught CoinError exceptionCaolán McNamara
Change-Id: I93488fa942f1975b9c32be6d37fc76ea955a2067
2014-05-26externals: do not use "v110_xp" when building with MSVC 2012 and SDK 8.0Michael Stahl
Change-Id: I40bc9e4c31e270f29cc145b5d2f3544cad586bf7
2014-05-22fdo#77313: coinmp: error: format not a string literal and no format argumentsMatúš Kukan
Change-Id: I044f12c4b7b28963d6d491d5e5850ddb59a564c4
2014-05-20Make CoinMP build for AndroidTor Lillqvist
(No idea whether it works, of course.) Patch the config.sub files to recognize arm-linux-androideabi. Don't build any binary programs as that fails for Android becuase we don't pass in the right C++ library to use anyway. (And those programs aren't really useful to us anyway, on any platform, I guess?) Change-Id: I70c7a527db41081a51548ce6983b6a9ae8a08bc7
2014-05-20Make CoinMP build for iOSTor Lillqvist
Change-Id: I8adff18896115d7dd0fce49916a18dc830506a36
2014-05-19fdo#77891 fix python crash when in GUI mode, target WinXP with VS2012Christian Lohmaier
VS2012 did change return value of fileno function, this results in a crash when run in GUI mode (but not when launching from a shell), as python tries to access the nonexisting stdin/stdout/stderr Also explicitly target Windows XP Change-Id: Ic783713b55453f3c38b2e766a664b7f4678711de
2014-04-11Don't even dare check for FortranStephan Bergmann
...which can lead to problems when e.g. building against a local trunk GCC (requiring LD_LIBRARY_PATH) that was configured to build only C/C++ compilers, so CoinMP's configuration would try to blend that with the system's gfortran. Change-Id: I9f237df0887e06e50b9e76f3a09cfebb6f22dc20
2014-04-05Fix Windows build(external/coinmp)Tomofumi Yagi
This patch fixes the problem that a linker misses CoinMP.dll. The problem will occurs when we use --enable-dbgutil option. Change-Id: If6cec0f9705db2af33cb9a69d9440e3053c5979a Reviewed-on: https://gerrit.libreoffice.org/8854 Reviewed-by: Matúš Kukan <matus.kukan@collabora.com> Tested-by: Matúš Kukan <matus.kukan@collabora.com>
2014-04-04coinmp: actually link the librariesMichael Stahl
Several people named Chris report failures in the solver unit test, and apparently the CoinMP libraries have loads of unresolved symbols because they don't have NEEDED entries, i.e. were not linked properly; let's see if this fixes it. Change-Id: Id406e14b0805a458d608c23cb7c65d873b5ba2f0 Reviewed-on: https://gerrit.libreoffice.org/8850 Reviewed-by: Chris Laplante <mostthingsweb@gmail.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
generated by cgit (git 2.34.1) at 2024-12-27 20:19:10 +0000