You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by pf...@apache.org on 2012/01/26 16:14:31 UTC
svn commit: r1236229 - in /incubator/ooo/trunk/ext_libraries/coinmp:
coinmp-1.6.0.patch makefile.mk
Author: pfg
Date: Thu Jan 26 15:14:30 2012
New Revision: 1236229
URL: http://svn.apache.org/viewvc?rev=1236229&view=rev
Log:
FreeBSD port: fix build of CoinMP. Submitted by Maho.
Added:
incubator/ooo/trunk/ext_libraries/coinmp/coinmp-1.6.0.patch
Modified:
incubator/ooo/trunk/ext_libraries/coinmp/makefile.mk
Added: incubator/ooo/trunk/ext_libraries/coinmp/coinmp-1.6.0.patch
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/ext_libraries/coinmp/coinmp-1.6.0.patch?rev=1236229&view=auto
==============================================================================
--- incubator/ooo/trunk/ext_libraries/coinmp/coinmp-1.6.0.patch (added)
+++ incubator/ooo/trunk/ext_libraries/coinmp/coinmp-1.6.0.patch Thu Jan 26 15:14:30 2012
@@ -0,0 +1,23 @@
+--- misc/CoinMP-1.6.0/Cbc/src/CbcEventHandler.hpp.orig 2007-08-10 12:18:20.000000000 -0400
++++ misc/build/CoinMP-1.6.0/Cbc/src/CbcEventHandler.hpp 2011-07-29 06:16:23.000000000 -0400
+@@ -43,6 +43,7 @@
+ */
+
+ #include <map>
++#include <cstddef>
+
+ /* May well already be declared, but can't hurt. */
+
+--- misc/CoinMP-1.6.0/Cbc/src/CbcSolver.cpp.orig 2011-12-23 10:36:33.000000000 -0500
++++ misc/build/CoinMP-1.6.0/Cbc/src/CbcSolver.cpp 2011-12-23 10:41:57.000000000 -0500
+@@ -1665,10 +1665,6 @@
+ }
+ sprintf(generalPrint + strlen(generalPrint),
+ "Build Date: %s \n", __DATE__);
+-#ifdef CBC_SVN_REV
+- sprintf(generalPrint + strlen(generalPrint),
+- "Revision Number: %d \n", CBC_SVN_REV);
+-#endif
+ generalMessageHandler->message(CLP_GENERAL, generalMessages)
+ << generalPrint
+ << CoinMessageEol;
Modified: incubator/ooo/trunk/ext_libraries/coinmp/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/ext_libraries/coinmp/makefile.mk?rev=1236229&r1=1236228&r2=1236229&view=diff
==============================================================================
--- incubator/ooo/trunk/ext_libraries/coinmp/makefile.mk (original)
+++ incubator/ooo/trunk/ext_libraries/coinmp/makefile.mk Thu Jan 26 15:14:30 2012
@@ -40,6 +40,8 @@ all:
TARFILE_NAME=CoinMP-1.6.0
TARFILE_MD5=2b5f1ca58d6ef30f18f1415b65bed81c
+PATCH_FILES=coinmp-1.6.0.patch
+
.IF "$(COM)"=="MSC"
BUILD_ACTION=$(COMPATH)$/vcpackages$/vcbuild.exe CoinMP\\MSVisualStudio\\v9\\CoinMP.sln "Release|Win32"
.ELSE