mirror of
https://git.FreeBSD.org/ports.git
synced 2025-01-20 08:27:15 +00:00
math/gringo: fix build with python3 scons
Approved by: portmgr blanket
This commit is contained in:
parent
764d8eabc1
commit
a8f6a20fd3
@ -15,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING
|
||||
|
||||
BUILD_DEPENDS= re2c:devel/re2c
|
||||
|
||||
USES= bison compiler:c++11-lib python:2.7 scons:python2
|
||||
USES= bison compiler:c++11-lib python:2.7 scons
|
||||
MAKE_ARGS= ${MAKE_ENV}
|
||||
CXXFLAGS+= -std=c++11
|
||||
MAKE_ENV= WITH_LUA=no
|
||||
|
@ -1,6 +1,34 @@
|
||||
--- SConscript.orig 2015-08-17 12:39:49 UTC
|
||||
--- SConscript.orig 2015-11-17 11:48:49 UTC
|
||||
+++ SConscript
|
||||
@@ -202,7 +202,7 @@ if env['WITH_LUA'] == "auto":
|
||||
@@ -171,21 +171,21 @@ DEFS = {}
|
||||
failure = False
|
||||
|
||||
if not conf.CheckBison():
|
||||
- print 'error: no usable bison version found'
|
||||
+ print('error: no usable bison version found')
|
||||
failure = True
|
||||
|
||||
if not conf.CheckRe2c():
|
||||
- print 'error: no usable re2c version found'
|
||||
+ print('error: no usable re2c version found')
|
||||
failure = True
|
||||
|
||||
if not conf.CheckCXX():
|
||||
- print 'error: no usable C++ compiler found'
|
||||
- print "Please check the log file for further information: " + log_file
|
||||
+ print('error: no usable C++ compiler found')
|
||||
+ print("Please check the log file for further information: " + log_file)
|
||||
Exit(1)
|
||||
|
||||
if not conf.CheckSHCXX():
|
||||
- print 'error: no usable (shared) C++ compiler found'
|
||||
- print "Please check the log file for further information: " + log_file
|
||||
+ print('error: no usable (shared) C++ compiler found')
|
||||
+ print("Please check the log file for further information: " + log_file)
|
||||
Exit(1)
|
||||
|
||||
with_python = False
|
||||
@@ -206,7 +206,7 @@ if env['WITH_LUA'] == "auto":
|
||||
if conf.CheckWithPkgConfig("lua", ["lua", "lua5.1", "lua-5.1", "lua5.2", "lua-5.2", "lua5.3", "lua-5.3"]):
|
||||
with_lua = True
|
||||
DEFS["WITH_LUA"] = 1
|
||||
@ -9,3 +37,38 @@
|
||||
if not conf.CheckLibs("lua", env['WITH_LUA'], "lua.hpp"):
|
||||
failure = True
|
||||
else:
|
||||
@@ -241,7 +241,7 @@ if env['WITH_TBB'] == "auto":
|
||||
with_tbb = True
|
||||
elif env['WITH_TBB']:
|
||||
if not claspConf.CheckLibs("tbb", env['WITH_TBB'], 'tbb/tbb.h'):
|
||||
- print 'error: tbb library not found'
|
||||
+ print('error: tbb library not found')
|
||||
failure = True
|
||||
else:
|
||||
with_tbb = True
|
||||
@@ -249,7 +249,7 @@ if with_tbb:
|
||||
DEFS["WITH_THREADS"] = 1
|
||||
if claspConf.CheckNeedRT():
|
||||
if not claspConf.CheckLibWithHeader('rt', 'time.h', 'C++'):
|
||||
- print 'error: rt library not found'
|
||||
+ print('error: rt library not found')
|
||||
failure = True
|
||||
|
||||
claspEnv = claspConf.Finish()
|
||||
@@ -267,14 +267,14 @@ if env['WITH_CPPUNIT']:
|
||||
elif testConf.CheckLibs("cppunit", env['WITH_CPPUNIT'], 'cppunit/TestFixture.h'):
|
||||
with_cppunit = True
|
||||
else:
|
||||
- print 'error: cppunit library not found'
|
||||
+ print('error: cppunit library not found')
|
||||
failure = True
|
||||
testEnv = testConf.Finish()
|
||||
|
||||
# {{{1 Check configuration
|
||||
|
||||
if failure:
|
||||
- print "Please check the log file for further information: " + log_file
|
||||
+ print("Please check the log file for further information: " + log_file)
|
||||
Exit(1)
|
||||
|
||||
# {{{1 Opts: Library
|
||||
|
Loading…
Reference in New Issue
Block a user