Attachment 163587 Details for Bug 204850 – patch

[patch] patch

cmsat.diff (text/plain), 6.08 KB, created by Gleb Popov on 2015-11-27 18:04:22 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Gleb Popov

Created: 2015-11-27 18:04:22 UTC

Size: 6.08 KB

patch

obsolete

>diff -ruN /usr/ports/math/cryptominisat/Makefile cryptominisat/Makefile
>--- /usr/ports/math/cryptominisat/Makefile	2015-05-06 00:54:29.000000000 +0300
>+++ cryptominisat/Makefile	2015-11-27 17:41:03.193387275 +0300
>@@ -1,21 +1,25 @@
> # $FreeBSD: head/math/cryptominisat/Makefile 385495 2015-05-05 21:54:29Z jbeich $
> 
> PORTNAME=	cryptominisat
>-PORTVERSION=	4.2.0
>-PORTREVISION?=	0
>+PORTVERSION=	4.5.3
> CATEGORIES?=	math
>-MASTER_SITES=	http://msoos.org/largefiles/
> 
> MAINTAINER=	6yearold@gmail.com
> COMMENT?=	General-purpose award-winning SAT solver
> 
> LICENSE?=	LGPL3
> 
>+USE_GITHUB=     yes
>+GH_ACCOUNT=     msoos
>+
>+BUILD_DEPENDS=	xxd:${PORTSDIR}/editors/vim # for xxd tool
> LIB_DEPENDS?=	libboost_program_options.so:${PORTSDIR}/devel/boost-libs
> 
>-USES?=		cmake compiler:c++11-lib tar:bzip2
>-CMAKE_ARGS=	-DNOMYSQL=1 -DNOM4RI=1 -DPYTHON_EXECUTABLE=0
>-WRKSRC=		${WRKDIR}/${PORTNAME}4-${PORTVERSION}
>+USES?=		cmake compiler:c++11-lib
>+CMAKE_ARGS=	-DNOMYSQL=1 -DNOM4RI=1
>+.if !defined(MASTERDIR)
>+CMAKE_ARGS+=	-DPYTHON_EXECUTABLE=0
> USE_LDCONFIG=	yes
>+.endif
> 
> .include <bsd.port.mk>
>diff -ruN /usr/ports/math/cryptominisat/distinfo cryptominisat/distinfo
>--- /usr/ports/math/cryptominisat/distinfo	2015-05-06 00:54:29.000000000 +0300
>+++ cryptominisat/distinfo	2015-11-27 11:15:19.922070837 +0300
>@@ -1,2 +1,2 @@
>-SHA256 (cryptominisat-4.2.0.tar.bz2) = 4fb35b3f91a5fddcdd021a92e6e9f1a9049fb03f354860b118e9937a15a8ff02
>-SIZE (cryptominisat-4.2.0.tar.bz2) = 634464
>+SHA256 (msoos-cryptominisat-4.5.3_GH0.tar.gz) = 114da20e25734dc368dada47afd8cb7d44717f2159ad66d5bac742062fa3eb4c
>+SIZE (msoos-cryptominisat-4.5.3_GH0.tar.gz) = 467221
>diff -ruN /usr/ports/math/cryptominisat/files/patch-cryptominisat4_CMakeLists.txt cryptominisat/files/patch-cryptominisat4_CMakeLists.txt
>--- /usr/ports/math/cryptominisat/files/patch-cryptominisat4_CMakeLists.txt	2015-05-06 00:54:29.000000000 +0300
>+++ cryptominisat/files/patch-cryptominisat4_CMakeLists.txt	1970-01-01 04:00:00.000000000 +0400
>@@ -1,10 +0,0 @@
>---- cryptominisat4/CMakeLists.txt.orig	2014-07-16 21:45:53 UTC
>-+++ cryptominisat4/CMakeLists.txt
>-@@ -85,6 +85,7 @@ target_link_libraries(libcryptominisat4
>- set_target_properties(libcryptominisat4 PROPERTIES
>-     OUTPUT_NAME cryptominisat4
>-     PUBLIC_HEADER "${cryptominisat4_public_headers}"
>-+    SOVERSION 0
>- )
>- 
>- cmsat_add_public_header(libcryptominisat4 cryptominisat.h )
>diff -ruN /usr/ports/math/cryptominisat/files/patch-cryptominisat4_bva.cpp cryptominisat/files/patch-cryptominisat4_bva.cpp
>--- /usr/ports/math/cryptominisat/files/patch-cryptominisat4_bva.cpp	2015-05-06 00:54:29.000000000 +0300
>+++ cryptominisat/files/patch-cryptominisat4_bva.cpp	1970-01-01 04:00:00.000000000 +0400
>@@ -1,10 +0,0 @@
>---- cryptominisat4/bva.cpp.orig	2014-07-14 22:45:03 UTC
>-+++ cryptominisat4/bva.cpp
>-@@ -25,6 +25,7 @@
>- #include "clausecleaner.h"
>- #include "subsumeimplicit.h"
>- #include "sqlstats.h"
>-+#include <cmath>
>- #include <functional>
>- 
>- using namespace CMSat;
>diff -ruN /usr/ports/math/cryptominisat/pkg-plist cryptominisat/pkg-plist
>--- /usr/ports/math/cryptominisat/pkg-plist	2015-05-06 00:54:29.000000000 +0300
>+++ cryptominisat/pkg-plist	2015-11-27 11:43:05.582956156 +0300
>@@ -1,9 +1,10 @@
>-bin/cryptominisat
>+bin/cryptominisat4
>+bin/cryptominisat4_simple
> include/cryptominisat4/cryptominisat.h
>-include/cryptominisat4/solverconf.h
> include/cryptominisat4/solvertypesmini.h
> lib/cmake/cryptominisat4/cryptominisat4Config.cmake
> lib/cmake/cryptominisat4/cryptominisat4Targets-%%CMAKE_BUILD_TYPE%%.cmake
> lib/cmake/cryptominisat4/cryptominisat4Targets.cmake
>+lib/libcryptominisat4.a
> lib/libcryptominisat4.so
>-lib/libcryptominisat4.so.0
>+lib/libcryptominisat4.so.4.5
>diff -ruN /usr/ports/math/py-cryptominisat/Makefile py-cryptominisat/Makefile
>--- /usr/ports/math/py-cryptominisat/Makefile	2015-05-06 00:54:29.000000000 +0300
>+++ py-cryptominisat/Makefile	2015-11-27 20:49:22.822612269 +0300
>@@ -9,14 +9,17 @@
> 
> LIB_DEPENDS=	libcryptominisat4.so:${PORTSDIR}/math/cryptominisat
> 
>-USES=		compiler:c++11-lib python:2.7 tar:bzip2
>-USE_PYTHON=	autoplist distutils
>-WRKSRC_SUBDIR=	python
>+USES=		cmake compiler:c++11-lib python:2
>+USE_PYTHON=	autoplist
>+ALL_TARGET=	pytarget
> 
> MASTERDIR=	${.CURDIR}/../cryptominisat
> PATCHDIR=	${.CURDIR}/files
> PLIST=		${.CURDIR}/pkg-plist
> 
>+do-install:
>+	cd ${WRKSRC}/py-lib && ${PYTHON_CMD} ${PYSETUP} install ${PYDISTUTILS_INSTALLARGS} --root=${STAGEDIR}
>+
> post-install:
> 	${FIND} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} -name \*.so \
> 		-exec ${STRIP_CMD} {} +
>diff -ruN /usr/ports/math/py-cryptominisat/files/patch-pycryptosat.cpp py-cryptominisat/files/patch-pycryptosat.cpp
>--- /usr/ports/math/py-cryptominisat/files/patch-pycryptosat.cpp	2015-05-06 00:54:29.000000000 +0300
>+++ py-cryptominisat/files/patch-pycryptosat.cpp	1970-01-01 04:00:00.000000000 +0400
>@@ -1,19 +0,0 @@
>-On FreeBSD -std=c++11 turns NULL into nullptr which sometimes breaks:
>-
>-  pycryptosat.cpp:393:12: error: cannot initialize return object of type 'int' with an rvalue of type 'nullptr_t'
>-      return NULL;
>-             ^~~~
>-  /usr/include/sys/_null.h:35:14: note: expanded from macro 'NULL'
>-  #define NULL    nullptr
>-                  ^~~~~~~
>---- pycryptosat.cpp.orig	2014-07-06 23:41:16 UTC
>-+++ pycryptosat.cpp
>-@@ -390,7 +390,7 @@ Solver_init(Solver *self, PyObject *args
>-     if (!self->cmsat) {
>-         return -1;
>-     }
>--    return NULL;
>-+    return 0;
>- }
>- 
>- static PyMemberDef Solver_members[] = {
>diff -ruN /usr/ports/math/py-cryptominisat/files/patch-python_CMakeLists.txt py-cryptominisat/files/patch-python_CMakeLists.txt
>--- /usr/ports/math/py-cryptominisat/files/patch-python_CMakeLists.txt	1970-01-01 04:00:00.000000000 +0400
>+++ py-cryptominisat/files/patch-python_CMakeLists.txt	2015-11-27 12:21:09.553802915 +0300
>@@ -0,0 +1,10 @@
>+--- python/CMakeLists.txt.orig	2015-11-27 09:20:52 UTC
>++++ python/CMakeLists.txt
>+@@ -7,7 +7,6 @@ configure_file(${SETUP_PY_IN} ${SETUP_PY
>+ add_custom_command(OUTPUT ${OUTPUT}/timestamp
>+                    COMMAND ${PYTHON_EXECUTABLE}
>+                    ARGS setup.py build_ext --inplace --rpath ../lib
>+-                   DEPENDS libcryptominisat4
>+ )
>+ 
>+ add_custom_target(pytarget ALL DEPENDS ${OUTPUT}/timestamp)

Flags:

arrowd: maintainer-approval+

Actions: View | Diff

Attachments on bug 204850: 163587 | 165103