Attachment #163587 for bug #204850




# $FreeBSD: head/math/cryptominisat/Makefile 385495 2015-05-05 21:54:29Z jbeich $

PORTNAME=	cryptominisat
PORTVERSION=	4.5.3
PORTREVISION?=	0
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
CMAKE_ARGS=	-DNOMYSQL=1 -DNOM4RI=1
.if !defined(MASTERDIR)
CMAKE_ARGS+=	-DPYTHON_EXECUTABLE=0
USE_LDCONFIG=	yes
.endif

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)cryptominisat/distinfo (-2 / +2 lines)
1	SHA256 (cryptominisat-4.2.0.tar.bz2) = 4fb35b3f91a5fddcdd021a92e6e9f1a9049fb03f354860b118e9937a15a8ff02	1	SHA256 (msoos-cryptominisat-4.5.3_GH0.tar.gz) = 114da20e25734dc368dada47afd8cb7d44717f2159ad66d5bac742062fa3eb4c
2	SIZE (cryptominisat-4.2.0.tar.bz2) = 634464	2	SIZE (msoos-cryptominisat-4.5.3_GH0.tar.gz) = 467221

Lines 1-10 Link Here

(-)cryptominisat/files/patch-cryptominisat4_CMakeLists.txt (-10 lines)
1	--- cryptominisat4/CMakeLists.txt.orig 2014-07-16 21:45:53 UTC
2	+++ cryptominisat4/CMakeLists.txt
3	@@ -85,6 +85,7 @@ target_link_libraries(libcryptominisat4
4	set_target_properties(libcryptominisat4 PROPERTIES
5	OUTPUT_NAME cryptominisat4
6	PUBLIC_HEADER "${cryptominisat4_public_headers}"
7	+ SOVERSION 0
8	)
9
10	cmsat_add_public_header(libcryptominisat4 cryptominisat.h )

Lines 1-10 Link Here

(-)cryptominisat/files/patch-cryptominisat4_bva.cpp (-10 lines)
1	--- cryptominisat4/bva.cpp.orig 2014-07-14 22:45:03 UTC
2	+++ cryptominisat4/bva.cpp
3	@@ -25,6 +25,7 @@
4	#include "clausecleaner.h"
5	#include "subsumeimplicit.h"
6	#include "sqlstats.h"
7	+#include <cmath>
8	#include <functional>
9
10	using namespace CMSat;

Lines 1-9 Link Here

(-)cryptominisat/pkg-plist (-3 / +4 lines)
1	bin/cryptominisat	1	bin/cryptominisat4
		2	bin/cryptominisat4_simple
2	include/cryptominisat4/cryptominisat.h	3	include/cryptominisat4/cryptominisat.h
3	include/cryptominisat4/solverconf.h
4	include/cryptominisat4/solvertypesmini.h	4	include/cryptominisat4/solvertypesmini.h
5	lib/cmake/cryptominisat4/cryptominisat4Config.cmake	5	lib/cmake/cryptominisat4/cryptominisat4Config.cmake
6	lib/cmake/cryptominisat4/cryptominisat4Targets-%%CMAKE_BUILD_TYPE%%.cmake	6	lib/cmake/cryptominisat4/cryptominisat4Targets-%%CMAKE_BUILD_TYPE%%.cmake
7	lib/cmake/cryptominisat4/cryptominisat4Targets.cmake	7	lib/cmake/cryptominisat4/cryptominisat4Targets.cmake
		8	lib/libcryptominisat4.a
8	lib/libcryptominisat4.so	9	lib/libcryptominisat4.so
9	lib/libcryptominisat4.so.0	10	lib/libcryptominisat4.so.4.5





LIB_DEPENDS=	libcryptominisat4.so:${PORTSDIR}/math/cryptominisat

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} {} +




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[] = {

Line 0 Link Here

(-)py-cryptominisat/files/patch-python_CMakeLists.txt (+10 lines)
	1	--- python/CMakeLists.txt.orig 2015-11-27 09:20:52 UTC
	2	+++ python/CMakeLists.txt
	3	@@ -7,7 +7,6 @@ configure_file(${SETUP_PY_IN} ${SETUP_PY
	4	add_custom_command(OUTPUT ${OUTPUT}/timestamp
	5	COMMAND ${PYTHON_EXECUTABLE}
	6	ARGS setup.py build_ext --inplace --rpath ../lib
	7	- DEPENDS libcryptominisat4
	8	)
	9
	10	add_custom_target(pytarget ALL DEPENDS ${OUTPUT}/timestamp)

Return to bug 204850

Lines 1-21 Link Here

(-)cryptominisat/Makefile (-6 / +10 lines)
1	# $FreeBSD: head/math/cryptominisat/Makefile 385495 2015-05-05 21:54:29Z jbeich $	1	# $FreeBSD: head/math/cryptominisat/Makefile 385495 2015-05-05 21:54:29Z jbeich $
2		2
3	PORTNAME= cryptominisat	3	PORTNAME= cryptominisat
4	PORTVERSION= 4.2.0	4	PORTVERSION= 4.5.3
5	PORTREVISION?= 0
6	CATEGORIES?= math	5	CATEGORIES?= math
7	MASTER_SITES= http://msoos.org/largefiles/
8		6
9	MAINTAINER= 6yearold@gmail.com	7	MAINTAINER= 6yearold@gmail.com
10	COMMENT?= General-purpose award-winning SAT solver	8	COMMENT?= General-purpose award-winning SAT solver
11		9
12	LICENSE?= LGPL3	10	LICENSE?= LGPL3
13		11
		12	USE_GITHUB= yes
		13	GH_ACCOUNT= msoos
		14
		15	BUILD_DEPENDS= xxd:${PORTSDIR}/editors/vim # for xxd tool
14	LIB_DEPENDS?= libboost_program_options.so:${PORTSDIR}/devel/boost-libs	16	LIB_DEPENDS?= libboost_program_options.so:${PORTSDIR}/devel/boost-libs
15		17
16	USES?= cmake compiler:c++11-lib tar:bzip2	18	USES?= cmake compiler:c++11-lib
17	CMAKE_ARGS= -DNOMYSQL=1 -DNOM4RI=1 -DPYTHON_EXECUTABLE=0	19	CMAKE_ARGS= -DNOMYSQL=1 -DNOM4RI=1
18	WRKSRC= ${WRKDIR}/${PORTNAME}4-${PORTVERSION}	20	.if !defined(MASTERDIR)
		21	CMAKE_ARGS+= -DPYTHON_EXECUTABLE=0
19	USE_LDCONFIG= yes	22	USE_LDCONFIG= yes
		23	.endif
20		24
21	.include <bsd.port.mk>	25	.include <bsd.port.mk>

Lines 9-22 Link Here

(-)py-cryptominisat/Makefile (-3 / +6 lines)
9		9
10	LIB_DEPENDS= libcryptominisat4.so:${PORTSDIR}/math/cryptominisat	10	LIB_DEPENDS= libcryptominisat4.so:${PORTSDIR}/math/cryptominisat
11		11
12	USES= compiler:c++11-lib python:2.7 tar:bzip2	12	USES= cmake compiler:c++11-lib python:2
13	USE_PYTHON= autoplist distutils	13	USE_PYTHON= autoplist
14	WRKSRC_SUBDIR= python	14	ALL_TARGET= pytarget
15		15
16	MASTERDIR= ${.CURDIR}/../cryptominisat	16	MASTERDIR= ${.CURDIR}/../cryptominisat
17	PATCHDIR= ${.CURDIR}/files	17	PATCHDIR= ${.CURDIR}/files
18	PLIST= ${.CURDIR}/pkg-plist	18	PLIST= ${.CURDIR}/pkg-plist
19		19
		20	do-install:
		21	cd ${WRKSRC}/py-lib && ${PYTHON_CMD} ${PYSETUP} install ${PYDISTUTILS_INSTALLARGS} --root=${STAGEDIR}
		22
20	post-install:	23	post-install:
21	${FIND} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} -name \*.so \	24	${FIND} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} -name \*.so \
22	-exec ${STRIP_CMD} {} +	25	-exec ${STRIP_CMD} {} +

Lines 1-19 Link Here

(-)py-cryptominisat/files/patch-pycryptosat.cpp (-19 lines)
1	On FreeBSD -std=c++11 turns NULL into nullptr which sometimes breaks:
2
3	pycryptosat.cpp:393:12: error: cannot initialize return object of type 'int' with an rvalue of type 'nullptr_t'
4	return NULL;
5	^~~~
6	/usr/include/sys/_null.h:35:14: note: expanded from macro 'NULL'
7	#define NULL nullptr
8	^~~~~~~
9	--- pycryptosat.cpp.orig 2014-07-06 23:41:16 UTC
10	+++ pycryptosat.cpp
11	@@ -390,7 +390,7 @@ Solver_init(Solver self, PyObject args
12	if (!self->cmsat) {
13	return -1;
14	}
15	- return NULL;
16	+ return 0;
17	}
18
19	static PyMemberDef Solver_members[] = {