summaryrefslogtreecommitdiff
path: root/external/coinmp
AgeCommit message (Collapse)AuthorFilesLines
2016-09-22coinmp: no need for bzip2 libraryMichael Stahl1-0/+1
Change-Id: I1f5115defa3619f13ce00d64d5532d2b08dc2ccb (cherry picked from commit 3d31cf66bb0c3f628cd175b50373f746ec45645f) Reviewed-on: https://gerrit.libreoffice.org/29177 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2016-03-03Fix coinmp on MSVC 14.0David Ostrovsky2-0/+13
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 Stahl1-1/+0
Change-Id: I8848d042a008c21e407d9610161b5c67d2137a18
2015-09-02Fix coinmp on MSVC 14.0David Ostrovsky1-0/+1
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 Bergmann3-0/+56
...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 Bergmann2-0/+12
Change-Id: I487e772395defa9aae2ce3eb040b8c7d92720cb2
2015-03-16external/coinmp: Work around -Werror,-Wformat-pedanticStephan Bergmann2-0/+11
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 Bergmann1-0/+11
Change-Id: I240c8c940d7d3e1310c4ee33911e8c7019e67060
2015-01-08coinmp: Don't hard code Win32 platform on WindowsDavid Ostrovsky3-2/+21
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 Gelonch1-2/+3
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 Stahl2-0/+11
Hopefully this should fix up the most important external libraries. Change-Id: I744cb5a2ce7fafb10852059050cf24589d6ca400
2014-09-17Bye bye VS2010Tor Lillqvist1-1/+0
Change-Id: I9d16f4f0df42ae4b046bc1e4ac4fba95c4b9d785
2014-08-09VS2013: Override ToolsVersion settingThomas Arnhold1-1/+1
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 Mencken1-8/+8
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 Lillqvist2-0/+353
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.patchrbuj2-1/+317
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 Ostrovsky1-0/+1
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 McNamara2-0/+12
Change-Id: I93488fa942f1975b9c32be6d37fc76ea955a2067
2014-05-26externals: do not use "v110_xp" when building with MSVC 2012 and SDK 8.0Michael Stahl1-1/+1
Change-Id: I40bc9e4c31e270f29cc145b5d2f3544cad586bf7
2014-05-22fdo#77313: coinmp: error: format not a string literal and no format argumentsMatúš Kukan2-0/+13
Change-Id: I044f12c4b7b28963d6d491d5e5850ddb59a564c4
2014-05-20Make CoinMP build for AndroidTor Lillqvist3-0/+170
(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 Lillqvist2-0/+4
Change-Id: I8adff18896115d7dd0fce49916a18dc830506a36
2014-05-19fdo#77891 fix python crash when in GUI mode, target WinXP with VS2012Christian Lohmaier1-1/+1
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 Bergmann1-1/+1
...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 Yagi1-1/+1
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 Stahl1-0/+1
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>
2014-03-03Add CoinMP external as an alternative to lpsolve.Matúš Kukan7-0/+3348
Change-Id: I9bf5c339a34655c3b842cef3af76814a14c483bc
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-30 17:02:05 +0000