math/coinmp: Remove other COIN-OR libraries

Several other COIN-OR libraries were built and installed
with OpenMP which caused file conflicts.

As it turned out, the 1.8.4 tarball on the COIN-OR website
had several other COIN-OR libraries bundled which caused
their automatic rebuild.

GitHub repository doesn't have bundled libraries at the same
tag. Switching to GitHub removed them.
This commit is contained in:
Yuri Victorovich 2021-05-04 13:48:11 -07:00
parent 5a75229d4c
commit ff80f43ba0
9 changed files with 36 additions and 384 deletions

View File

@ -1,12 +1,12 @@
# Created by: Pedro Giffuni
PORTNAME= CoinMP
PORTVERSION= 1.8.4
PORTREVISION= 3
DISTVERSIONPREFIX= releases/
DISTVERSION= 1.8.4
PORTREVISION= 4
CATEGORIES= math
MASTER_SITES= http://www.coin-or.org/download/source/CoinMP/
MAINTAINER= ports@FreeBSD.org
MAINTAINER= yuri@FreeBSD.org
COMMENT= Optimization library with support for COIN-OR CLP, CBC, and CGL
LICENSE= CPL
@ -14,23 +14,40 @@ LICENSE_NAME= Common Public License, Version 1.0
LICENSE_FILE= ${WRKSRC}/CoinMP/LICENSE
LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
CONFLICTS= clp-[0-9]* ogdf-[0-9]*
LIB_DEPENDS= libblas.so:math/blas \
libCbc.so:math/cbc \
libCgl.so:math/cgl \
libClp.so:math/clp \
libcoinasl.so:math/asl \
libcoinmumps.so:math/ipopt \
libCoinUtils.so:math/coinutils \
libopenblas.so:math/openblas
USES= compiler:c++11-lang libtool pathfix pkgconfig
USE_LDCONFIG= yes
USE_GITHUB= yes
GH_ACCOUNT= coin-or
GH_PROJECT= CoinMP
GNU_CONFIGURE= yes
USES= compiler:c++11-lang libtool pathfix pkgconfig tar:tgz
USE_LDCONFIG= yes
CXXFLAGS+= -ffast-math
OPTIONS_DEFINE= DEBUG DOCS FORTRAN GLPK PARALLEL
PLIST_FILES= include/coin/CoinMP.h \
include/coin/CoinMPConfig.h \
lib/libCoinMP.so \
lib/libCoinMP.so.1 \
lib/libCoinMP.so.1.8.4 \
libdata/pkgconfig/coinmp.pc
OPTIONS_DEFINE= DOCS FORTRAN GLPK
FORTRAN_DESC= Use BLAS/LAPACK with the Fortran interface
GLPK_DESC= GNU Linear Programming Kit support
PARALLEL_DESC= Enable CBC threads support
PORTDOCS= *
DEBUG_CXXFLAGS= -fomit-frame-pointer
FORTRAN_USES= fortran blaslapack
FORTRAN_CONFIGURE_ON= --with-lapack-lib="${LAPACKLIB} -L${LOCALBASE}/lib" \
--with-blas-lib="${BLASLIB} -L${LOCALBASE}/lib"
@ -40,22 +57,17 @@ GLPK_CONFIGURE_ON= --with-gmpl-incdir=${LOCALBASE}/include \
--with-gmpl-lib="-L${LOCALBASE}/lib -lglpk"
GLPK_CONFIGURE_OFF= --disable-glpk-libcheck
PARALLEL_CONFIGURE_ON= --enable-cbc-parallel
INSTALL_TARGET= install-strip
TEST_TARGET= unitTest
TEST_WRKSRC= ${WRKSRC}/${PORTNAME}
post-patch::
@${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} \
@${REINPLACE_CMD} \
-e 's|$$(DESTDIR)$$(addlibsdir)|$$(addlibsdir)|g' \
-e 's|addlibs_DATA = examples/Makefile examples/example.c||g' \
-e 's|DocInstallDir = $$(datadir)/coin/doc/$$(PACKAGE_NAME)|DocInstallDir = $$(datadir)/doc/CoinMP/$$(PACKAGE_NAME)|' \
-e 's| $$(MAKE) $$(AM_MAKEFLAGS) install-data-hook||'
@${FIND} ${WRKSRC} -name configure | ${XARGS} ${REINPLACE_CMD} \
-e 's|void exit (int)|void reserved (int)|g'
${REINPLACE_CMD} -e 's|datacoin_DATA = $$(EXAMPLE_FILES)|datacoin_DATA = |' \
-e 's|datacoindir = $$(datadir)/coin/Data/Sample|datacoindir = |' ${WRKSRC}/Data/Sample/Makefile.in
${REINPLACE_CMD} -e 's|addlibsdir = $$(DESTDIR)$$(datadir)/coin/doc/CoinMP|addlibsdir = |' ${WRKSRC}/CoinMP/Makefile.in
-e 's| $$(MAKE) $$(AM_MAKEFLAGS) install-data-hook||' \
${WRKSRC}/Makefile.in ${WRKSRC}/CoinMP/Makefile.in
@${REINPLACE_CMD} -e 's|addlibsdir = $$(DESTDIR)$$(datadir)/coin/doc/CoinMP|addlibsdir = |' ${WRKSRC}/CoinMP/Makefile.in
.include <bsd.port.mk>

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1551127739
SHA256 (CoinMP-1.8.4.tgz) = 3459fb0ccbdd39342744684338984ac4cc153fb0434f4cae8cf74bd67490a38d
SIZE (CoinMP-1.8.4.tgz) = 10778373
TIMESTAMP = 1620160264
SHA256 (coin-or-CoinMP-releases-1.8.4_GH0.tar.gz) = ec03a5110d9d79da950669e3400f3b81c4391747b14821d8997f9f8755873150
SIZE (coin-or-CoinMP-releases-1.8.4_GH0.tar.gz) = 4142865

View File

@ -1,13 +0,0 @@
--- Cbc/src/CbcSolver.cpp.orig 2011-12-23 05:36:33 UTC
+++ Cbc/src/CbcSolver.cpp
@@ -1876,10 +1876,6 @@ int CbcMain1 (int argc, const char *argv
}
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;

View File

@ -1,15 +0,0 @@
CbcModel.cpp:5322:41: error: reinterpret_cast from 'nullptr_t' to 'double *' is not allowed
clpSolver->setFakeObjective(reinterpret_cast<double *> (NULL));
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
--- Cbc/src/CbcModel.cpp.orig 2015-06-04 17:10:17 UTC
+++ Cbc/src/CbcModel.cpp
@@ -5319,7 +5319,7 @@ void CbcModel::branchAndBound(int doStatistics)
OsiClpSolverInterface * clpSolver
= dynamic_cast<OsiClpSolverInterface *> (solver_);
if (clpSolver)
- clpSolver->setFakeObjective(reinterpret_cast<double *> (NULL));
+ clpSolver->setFakeObjective(static_cast<double *> (NULL));
}
#endif
moreSpecialOptions_ = saveMoreSpecialOptions;

View File

@ -1,17 +0,0 @@
In file included from CglLandPSimplex.cpp:11:
In file included from ./CglLandPSimplex.hpp:31:
./CglLandPUtils.hpp:88:25: error: reinterpret_cast from 'nullptr_t' to 'OsiRowCut *' is not allowed
cuts_.resize(i, reinterpret_cast<OsiRowCut *> (NULL));
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
--- Cgl/src/CglLandP/CglLandPUtils.hpp.orig 2013-04-06 20:39:53 UTC
+++ Cgl/src/CglLandP/CglLandPUtils.hpp
@@ -85,7 +85,7 @@ struct Cuts
/** resize vector.*/
void resize(unsigned int i)
{
- cuts_.resize(i, reinterpret_cast<OsiRowCut *> (NULL));
+ cuts_.resize(i, static_cast<OsiRowCut *> (NULL));
}
private:
/** Stores the number of cuts.*/

View File

@ -1,15 +0,0 @@
ClpModel.cpp:3848:24: error: reinterpret_cast from 'nullptr_t' to 'const char *' is not allowed
reinterpret_cast<const char*> (NULL) /*integrality*/,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
--- Clp/src/ClpModel.cpp.orig 2015-03-19 08:09:18 UTC
+++ Clp/src/ClpModel.cpp
@@ -3845,7 +3845,7 @@ ClpModel::writeMps(const char *filename,
writer.setMpsData(*(matrix_->getPackedMatrix()), COIN_DBL_MAX,
getColLower(), getColUpper(),
objective,
- reinterpret_cast<const char*> (NULL) /*integrality*/,
+ static_cast<const char*> (NULL) /*integrality*/,
getRowLower(), getRowUpper(),
columnNames, rowNames);
// Pass in array saying if each variable integer

View File

@ -1,15 +0,0 @@
OsiClpSolverInterface.cpp:1451:50: error: reinterpret_cast from 'nullptr_t' to 'int *' is not allowed
messagesPointer->setDetailMessages(100,10000,reinterpret_cast<int *> (NULL));
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
--- Clp/src/OsiClp/OsiClpSolverInterface.cpp.orig 2015-07-14 13:16:13 UTC
+++ Clp/src/OsiClp/OsiClpSolverInterface.cpp
@@ -1448,7 +1448,7 @@ OsiClpSolverInterface::setupForRepeatedUse(int senseOf
if (stopPrinting) {
CoinMessages * messagesPointer = modelPtr_->messagesPointer();
// won't even build messages
- messagesPointer->setDetailMessages(100,10000,reinterpret_cast<int *> (NULL));
+ messagesPointer->setDetailMessages(100,10000,static_cast<int *> (NULL));
}
#endif
}

View File

@ -1,11 +0,0 @@
--- CoinUtils/src/CoinSignal.hpp.orig 2015-04-15 15:07:42 UTC
+++ CoinUtils/src/CoinSignal.hpp
@@ -44,7 +44,7 @@
//-----------------------------------------------------------------------------
#if defined(__FreeBSD__) && defined(__GNUC__)
- typedef __decltype(SIG_DFL) CoinSighandler_t;
+ typedef typeof(SIG_DFL) CoinSighandler_t;
# define CoinSighandler_t_defined
#endif

View File

@ -1,274 +0,0 @@
bin/cbc
bin/clp
include/coin/CbcBranchActual.hpp
include/coin/CbcBranchAllDifferent.hpp
include/coin/CbcBranchBase.hpp
include/coin/CbcBranchCut.hpp
include/coin/CbcBranchDecision.hpp
include/coin/CbcBranchDefaultDecision.hpp
include/coin/CbcBranchDynamic.hpp
include/coin/CbcBranchLotsize.hpp
include/coin/CbcBranchToFixLots.hpp
include/coin/CbcBranchingObject.hpp
include/coin/CbcClique.hpp
include/coin/CbcCompare.hpp
include/coin/CbcCompareActual.hpp
include/coin/CbcCompareBase.hpp
include/coin/CbcCompareDefault.hpp
include/coin/CbcCompareDepth.hpp
include/coin/CbcCompareEstimate.hpp
include/coin/CbcCompareObjective.hpp
include/coin/CbcConfig.h
include/coin/CbcConsequence.hpp
include/coin/CbcCountRowCut.hpp
include/coin/CbcCutGenerator.hpp
include/coin/CbcCutModifier.hpp
include/coin/CbcCutSubsetModifier.hpp
include/coin/CbcDummyBranchingObject.hpp
include/coin/CbcEventHandler.hpp
include/coin/CbcFathom.hpp
include/coin/CbcFathomDynamicProgramming.hpp
include/coin/CbcFeasibilityBase.hpp
include/coin/CbcFixVariable.hpp
include/coin/CbcFollowOn.hpp
include/coin/CbcFullNodeInfo.hpp
include/coin/CbcGeneral.hpp
include/coin/CbcGeneralDepth.hpp
include/coin/CbcHeuristic.hpp
include/coin/CbcHeuristicDINS.hpp
include/coin/CbcHeuristicDW.hpp
include/coin/CbcHeuristicDive.hpp
include/coin/CbcHeuristicDiveCoefficient.hpp
include/coin/CbcHeuristicDiveFractional.hpp
include/coin/CbcHeuristicDiveGuided.hpp
include/coin/CbcHeuristicDiveLineSearch.hpp
include/coin/CbcHeuristicDivePseudoCost.hpp
include/coin/CbcHeuristicDiveVectorLength.hpp
include/coin/CbcHeuristicFPump.hpp
include/coin/CbcHeuristicGreedy.hpp
include/coin/CbcHeuristicLocal.hpp
include/coin/CbcHeuristicPivotAndFix.hpp
include/coin/CbcHeuristicRENS.hpp
include/coin/CbcHeuristicRINS.hpp
include/coin/CbcHeuristicRandRound.hpp
include/coin/CbcHeuristicVND.hpp
include/coin/CbcLinked.hpp
include/coin/CbcMessage.hpp
include/coin/CbcMipStartIO.hpp
include/coin/CbcModel.hpp
include/coin/CbcNWay.hpp
include/coin/CbcNode.hpp
include/coin/CbcNodeInfo.hpp
include/coin/CbcObject.hpp
include/coin/CbcObjectUpdateData.hpp
include/coin/CbcOrClpParam.cpp
include/coin/CbcOrClpParam.hpp
include/coin/CbcParam.hpp
include/coin/CbcPartialNodeInfo.hpp
include/coin/CbcSOS.hpp
include/coin/CbcSimpleInteger.hpp
include/coin/CbcSimpleIntegerDynamicPseudoCost.hpp
include/coin/CbcSimpleIntegerPseudoCost.hpp
include/coin/CbcSolver.hpp
include/coin/CbcStrategy.hpp
include/coin/CbcSubProblem.hpp
include/coin/CbcTree.hpp
include/coin/CbcTreeLocal.hpp
include/coin/Cbc_C_Interface.h
include/coin/Cgl012cut.hpp
include/coin/CglAllDifferent.hpp
include/coin/CglClique.hpp
include/coin/CglConfig.h
include/coin/CglCutGenerator.hpp
include/coin/CglDuplicateRow.hpp
include/coin/CglFlowCover.hpp
include/coin/CglGMI.hpp
include/coin/CglGMIParam.hpp
include/coin/CglGomory.hpp
include/coin/CglKnapsackCover.hpp
include/coin/CglLandP.hpp
include/coin/CglLandPValidator.hpp
include/coin/CglLiftAndProject.hpp
include/coin/CglMessage.hpp
include/coin/CglMixedIntegerRounding.hpp
include/coin/CglMixedIntegerRounding2.hpp
include/coin/CglOddHole.hpp
include/coin/CglParam.hpp
include/coin/CglPreProcess.hpp
include/coin/CglProbing.hpp
include/coin/CglRedSplit.hpp
include/coin/CglRedSplit2.hpp
include/coin/CglRedSplit2Param.hpp
include/coin/CglRedSplitParam.hpp
include/coin/CglResidualCapacity.hpp
include/coin/CglSimpleRounding.hpp
include/coin/CglStored.hpp
include/coin/CglTreeInfo.hpp
include/coin/CglTwomir.hpp
include/coin/CglZeroHalf.hpp
include/coin/ClpAmplObjective.hpp
include/coin/ClpCholeskyBase.hpp
include/coin/ClpCholeskyDense.hpp
include/coin/ClpConfig.h
include/coin/ClpConstraint.hpp
include/coin/ClpConstraintAmpl.hpp
include/coin/ClpConstraintLinear.hpp
include/coin/ClpConstraintQuadratic.hpp
include/coin/ClpDualRowDantzig.hpp
include/coin/ClpDualRowPivot.hpp
include/coin/ClpDualRowSteepest.hpp
include/coin/ClpDummyMatrix.hpp
include/coin/ClpDynamicExampleMatrix.hpp
include/coin/ClpDynamicMatrix.hpp
include/coin/ClpEventHandler.hpp
include/coin/ClpFactorization.hpp
include/coin/ClpGubDynamicMatrix.hpp
include/coin/ClpGubMatrix.hpp
include/coin/ClpInterior.hpp
include/coin/ClpLinearObjective.hpp
include/coin/ClpMatrixBase.hpp
include/coin/ClpMessage.hpp
include/coin/ClpModel.hpp
include/coin/ClpNetworkMatrix.hpp
include/coin/ClpNode.hpp
include/coin/ClpNonLinearCost.hpp
include/coin/ClpObjective.hpp
include/coin/ClpPackedMatrix.hpp
include/coin/ClpParameters.hpp
include/coin/ClpPdcoBase.hpp
include/coin/ClpPlusMinusOneMatrix.hpp
include/coin/ClpPresolve.hpp
include/coin/ClpPrimalColumnDantzig.hpp
include/coin/ClpPrimalColumnPivot.hpp
include/coin/ClpPrimalColumnSteepest.hpp
include/coin/ClpQuadraticObjective.hpp
include/coin/ClpSimplex.hpp
include/coin/ClpSimplexDual.hpp
include/coin/ClpSimplexNonlinear.hpp
include/coin/ClpSimplexOther.hpp
include/coin/ClpSimplexPrimal.hpp
include/coin/ClpSolve.hpp
include/coin/Clp_C_Interface.h
include/coin/CoinAlloc.hpp
include/coin/CoinBuild.hpp
include/coin/CoinDenseFactorization.hpp
include/coin/CoinDenseVector.hpp
include/coin/CoinDistance.hpp
include/coin/CoinError.hpp
include/coin/CoinFactorization.hpp
include/coin/CoinFileIO.hpp
include/coin/CoinFinite.hpp
include/coin/CoinFloatEqual.hpp
include/coin/CoinHelperFunctions.hpp
include/coin/CoinIndexedVector.hpp
include/coin/CoinLpIO.hpp
include/coin/CoinMP.h
include/coin/CoinMPConfig.h
include/coin/CoinMessage.hpp
include/coin/CoinMessageHandler.hpp
include/coin/CoinModel.hpp
include/coin/CoinModelUseful.hpp
include/coin/CoinMpsIO.hpp
include/coin/CoinOslFactorization.hpp
include/coin/CoinPackedMatrix.hpp
include/coin/CoinPackedVector.hpp
include/coin/CoinPackedVectorBase.hpp
include/coin/CoinParam.hpp
include/coin/CoinPragma.hpp
include/coin/CoinPresolveDoubleton.hpp
include/coin/CoinPresolveDual.hpp
include/coin/CoinPresolveDupcol.hpp
include/coin/CoinPresolveEmpty.hpp
include/coin/CoinPresolveFixed.hpp
include/coin/CoinPresolveForcing.hpp
include/coin/CoinPresolveImpliedFree.hpp
include/coin/CoinPresolveIsolated.hpp
include/coin/CoinPresolveMatrix.hpp
include/coin/CoinPresolveMonitor.hpp
include/coin/CoinPresolvePsdebug.hpp
include/coin/CoinPresolveSingleton.hpp
include/coin/CoinPresolveSubst.hpp
include/coin/CoinPresolveTighten.hpp
include/coin/CoinPresolveTripleton.hpp
include/coin/CoinPresolveUseless.hpp
include/coin/CoinPresolveZeros.hpp
include/coin/CoinRational.hpp
include/coin/CoinSearchTree.hpp
include/coin/CoinShallowPackedVector.hpp
include/coin/CoinSignal.hpp
include/coin/CoinSimpFactorization.hpp
include/coin/CoinSmartPtr.hpp
include/coin/CoinSnapshot.hpp
include/coin/CoinSort.hpp
include/coin/CoinStructuredModel.hpp
include/coin/CoinTime.hpp
include/coin/CoinTypes.hpp
include/coin/CoinUtility.hpp
include/coin/CoinUtilsConfig.h
include/coin/CoinWarmStart.hpp
include/coin/CoinWarmStartBasis.hpp
include/coin/CoinWarmStartDual.hpp
include/coin/CoinWarmStartPrimalDual.hpp
include/coin/CoinWarmStartVector.hpp
include/coin/Coin_C_defines.h
include/coin/Idiot.hpp
include/coin/OsiAuxInfo.hpp
include/coin/OsiBranchingObject.hpp
include/coin/OsiCbcSolverInterface.hpp
include/coin/OsiChooseVariable.hpp
include/coin/OsiClpSolverInterface.hpp
include/coin/OsiColCut.hpp
include/coin/OsiCollections.hpp
include/coin/OsiConfig.h
include/coin/OsiCut.hpp
include/coin/OsiCuts.hpp
include/coin/OsiPresolve.hpp
include/coin/OsiRowCut.hpp
include/coin/OsiRowCutDebugger.hpp
include/coin/OsiSolverBranch.hpp
include/coin/OsiSolverInterface.hpp
include/coin/OsiSolverParameters.hpp
include/coin/OsiUnitTests.hpp
lib/libCbc.so
lib/libCbc.so.3
lib/libCbc.so.3.9.10
lib/libCbcSolver.so
lib/libCbcSolver.so.3
lib/libCbcSolver.so.3.9.10
lib/libCgl.so
lib/libCgl.so.1
lib/libCgl.so.1.9.11
lib/libClp.so
lib/libClp.so.1
lib/libClp.so.1.13.12
lib/libClpSolver.so
lib/libClpSolver.so.1
lib/libClpSolver.so.1.13.12
lib/libCoinMP.so
lib/libCoinMP.so.1
lib/libCoinMP.so.1.8.4
lib/libCoinUtils.so
lib/libCoinUtils.so.3
lib/libCoinUtils.so.3.10.15
lib/libOsi.so
lib/libOsi.so.1
lib/libOsi.so.1.12.10
lib/libOsiCbc.so
lib/libOsiCbc.so.3
lib/libOsiCbc.so.3.9.10
lib/libOsiClp.so
lib/libOsiClp.so.1
lib/libOsiClp.so.1.13.12
lib/libOsiCommonTests.so
lib/libOsiCommonTests.so.1
lib/libOsiCommonTests.so.1.12.10
libdata/pkgconfig/cbc.pc
libdata/pkgconfig/cgl.pc
libdata/pkgconfig/clp.pc
libdata/pkgconfig/coindatasample.pc
libdata/pkgconfig/coinmp.pc
libdata/pkgconfig/coinutils.pc
libdata/pkgconfig/osi-cbc.pc
libdata/pkgconfig/osi-clp.pc
libdata/pkgconfig/osi-unittests.pc
libdata/pkgconfig/osi.pc