Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 14 Apr 2021 06:45:29 GMT
From:      Alexey Dokuchaev <danfe@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: f920019e64c9 - main - Unbreak the build of `math/py-or-tools' against recently updated `devel/abseil' by using the same treatment as in `math/or-tools'.
Message-ID:  <202104140645.13E6jTPQ014950@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by danfe:

URL: https://cgit.FreeBSD.org/ports/commit/?id=f920019e64c95bd337b846eff601921457919f97

commit f920019e64c95bd337b846eff601921457919f97
Author:     Alexey Dokuchaev <danfe@FreeBSD.org>
AuthorDate: 2021-04-14 06:40:42 +0000
Commit:     Alexey Dokuchaev <danfe@FreeBSD.org>
CommitDate: 2021-04-14 06:44:33 +0000

    Unbreak the build of `math/py-or-tools' against recently updated
    `devel/abseil' by using the same treatment as in `math/or-tools'.
    
    Reported by:    yuri
    Pointy hat to:  danfe
---
 math/py-or-tools/Makefile | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/math/py-or-tools/Makefile b/math/py-or-tools/Makefile
index 8ec653834e69..b1511cd36122 100644
--- a/math/py-or-tools/Makefile
+++ b/math/py-or-tools/Makefile
@@ -48,6 +48,13 @@ SCIP_DESC=		Use the SCIP solver # SCIP package isn't built because of licensing
 SCIP_CMAKE_BOOL=	USE_SCIP
 SCIP_LIB_DEPENDS=	libscip.so:math/SCIP
 
+post-patch:
+	@${REINPLACE_CMD} -e '/absl::container/s,^,#,' \
+		${WRKSRC}/ortools/constraint_solver/CMakeLists.txt \
+		${WRKSRC}/ortools/glop/CMakeLists.txt \
+		${WRKSRC}/ortools/linear_solver/CMakeLists.txt \
+		${WRKSRC}/ortools/sat/CMakeLists.txt
+
 do-install: # by default cmake installs the whole or-tools project without the python part, so extract the wheel and install python files manually here
 	${MKDIR} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
 	cd ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} && \



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202104140645.13E6jTPQ014950>