Page MenuHomeFreeBSD
Differential D15735 Diff 43541 math/py-cryptominisat/files/patch-setup.py.in

Changeset View

Standalone View

View Options

math/py-cryptominisat/files/patch-setup.py.in

--- setup.py.in.orig 2016-07-06 12:22:54 UTC --- setup.py.in.orig 2018-06-05 06:06:54 UTC
+++ setup.py.in +++ setup.py.in
@@ -26,9 +26,9 @@ import sys @@ -32,12 +32,12 @@ from distutils.cmd import Command
from distutils.core import setup, Extension
from distutils import sysconfig
__PACKAGE_VERSION__ = "0.2.0"
__LIBRARY_VERSION__ = "${CMS_FULL_VERSION}"
-os.environ["CC"] = "${CMAKE_C_COMPILER}"
-os.environ["CXX"] = "${CMAKE_CXX_COMPILER}"
+os.environ["CC"] = "cc"
tcbernerUnsubmitted
Done
Inline Actions

Why is this change needed, ... ah, because you're not using cmake anymore here.

You should probably reinplace ${CC} instead of using 'cc' directly in the patch.

tcberner: Why is this change needed, ... ah, because you're not using cmake anymore here. You should…
+os.environ["CXX"] = "c++"
-cconf = """${PY_C_CONFIG}""".split(" ") -cconf = """${PY_C_CONFIG}""".split(" ")
-ldconf = """${PY_LD_CONFIG}""".split(" ") -ldconf = """${PY_LD_CONFIG}""".split(" ")
-is_apple = """${APPLE}""" -is_apple = """${APPLE}"""
+cconf = """""".split(" ") +cconf = """""".split(" ")
+ldconf = """""".split(" ") +ldconf = """""".split(" ")
+is_apple = """""" +is_apple = """"""
def cleanup(dat): def cleanup(dat):
ret = [] ret = []
@@ -81,12 +81,12 @@ __version__ = '@PROJECT_VERSION@' @@ -110,7 +110,7 @@ class TestCommand(Command):
tp.run()
ext_kwds = dict(
-__version__ = '@PROJECT_VERSION@'
+__version__ = '5.6.1'
# needed because Mac doesn't make use of runtime_library_dirs
extra_link_args = list(ldconf)
@@ -119,12 +119,12 @@ if platform.system() == 'Darwin':
modules = dict(
name = "pycryptosat", name = "pycryptosat",
- sources = ["${CMAKE_CURRENT_SOURCE_DIR}/pycryptosat.cpp"], - sources = ["${CMAKE_CURRENT_SOURCE_DIR}/src/pycryptosat.cpp"],
+ sources = ["pycryptosat.cpp"], + sources = ["src/pycryptosat.cpp"],
define_macros = [], define_macros = [('LIBRARY_VERSION', '"' + __LIBRARY_VERSION__ + '"')],
- extra_compile_args = cconf + ['-I${PROJECT_SOURCE_DIR}', '-I${PROJECT_BINARY_DIR}/cmsat5-src'], - extra_compile_args = cconf + ['-I${PROJECT_SOURCE_DIR}', '-I${PROJECT_BINARY_DIR}/cmsat5-src'],
+ extra_compile_args = cconf + ['-I/usr/local/include', '-I../cmsat5-src'], + extra_compile_args = cconf + ['-I/usr/local/include', '-I../cmsat5-src'],
extra_link_args = ldconf, extra_link_args = extra_link_args,
language = "c++", language = "c++",
- library_dirs=['.', '${PROJECT_BINARY_DIR}/lib'], - library_dirs=['.', '${PROJECT_BINARY_DIR}/lib'],
+ library_dirs=['.', '/usr/local/lib'], + library_dirs=['.', '/usr/local/lib'],
runtime_library_dirs=['${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}'],
libraries = ['cryptominisat5'] libraries = ['cryptominisat5']
) )
@@ -150,7 +150,7 @@ setup(
@@ -111,5 +111,5 @@ setup( description = "Bindings to CryptoMiniSat {} (a SAT solver)".\
ext_modules = [Extension(**ext_kwds)], format(__LIBRARY_VERSION__),
py_modules = ['pycryptosat'], # py_modules = ['pycryptosat'],
description = "bindings to CryptoMiniSat (a SAT solver)",
- long_description = open('${CMAKE_CURRENT_SOURCE_DIR}/README.rst').read(), - long_description = open('${CMAKE_CURRENT_SOURCE_DIR}/README.rst').read(),
+ long_description = open('README.rst').read(), + long_description = open('README.rst').read(),
) cmdclass={
'test': TestCommand
}
No newline at end of file