incubator-ooo-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Maho NAKATA <m...@apache.org>
Subject coinmp on FreeBSD
Date Thu, 26 Jan 2012 13:54:01 GMT
Hi Pedro,

please apply following patch!

--- /dev/null	2012-01-26 22:45:15.000000000 +0900
+++ ext_libraries/coinmp/CoinMP-1.6.0.patch	2012-01-26 22:33:30.000000000 +0900
@@ -0,0 +1,23 @@
+--- misc/CoinMP-1.6.0/Cbc/src/CbcEventHandler.hpp	2011-06-20 02:23:14.000000000 +0900
++++ misc/build/CoinMP-1.6.0/Cbc/src/CbcEventHandler.hpp	2012-01-26 22:17:47.000000000 +0900
+@@ -47,6 +47,7 @@
+ */
+ 
+ #include <map>
++#include <cstddef>
+ 
+ /* May well already be declared, but can't hurt. */
+ 
+--- misc/CoinMP-1.6.0/Cbc/src/CbcSolver.cpp	2011-11-01 08:34:55.000000000 +0900
++++ misc/build/CoinMP-1.6.0/Cbc/src/CbcSolver.cpp	2012-01-26 22:32:46.000000000 +0900
+@@ -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;
--- ext_libraries/coinmp/makefile.mk.org	2012-01-26 22:02:39.000000000 +0900
+++ ext_libraries/coinmp/makefile.mk	2012-01-26 22:03:13.000000000 +0900
@@ -47,6 +47,8 @@
 BUILD_ACTION=$(GNUMAKE)
 .ENDIF
 
+PATCH_FILES=CoinMP-1.6.0.patch
+
 OUT2INC+=CoinMP$/src/CoinMP.h
 
 .IF "$(OS)"=="WNT"

Mime
View raw message