1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
|
--- bin/yoda-config.in.orig 2016-07-11 14:43:05.700511377 +0300
+++ bin/yoda-config.in 2016-07-11 14:43:50.312499322 +0300
@@ -59,7 +59,7 @@
## "Pre-rolled" build info
tmp=$( echo "$*" | egrep -- '--\<cflags\>|--\<cppflags\>|--\<cxxflags\>')
-test -n "$tmp" && OUT="$OUT -I@includedir@ @BOOST_CPPFLAGS@"
+test -n "$tmp" && OUT="$OUT -I@includedir@"
tmp=$( echo "$*" | egrep -- '--\<ldflags\>|--\<libs\>|--\<ldadd\>')
test -n "$tmp" && OUT="$OUT -L@libdir@ -lYODA"
--- bin/yoda-config.orig 2016-07-11 14:43:31.960503275 +0300
+++ bin/yoda-config 2016-07-11 14:43:41.200501112 +0300
@@ -59,7 +59,7 @@
## "Pre-rolled" build info
tmp=$( echo "$*" | egrep -- '--\<cflags\>|--\<cppflags\>|--\<cxxflags\>')
-test -n "$tmp" && OUT="$OUT -I${prefix}/include @BOOST_CPPFLAGS@"
+test -n "$tmp" && OUT="$OUT -I${prefix}/include"
tmp=$( echo "$*" | egrep -- '--\<ldflags\>|--\<libs\>|--\<ldadd\>')
test -n "$tmp" && OUT="$OUT -L${exec_prefix}/lib -lYODA"
--- configure.orig 2016-09-30 09:04:54.000000000 +0200
+++ configure 2016-09-30 09:07:44.000000000 +0200
@@ -16508,11 +16508,15 @@
cat >conftest.py <<_ACEOF
import sys, string
+# Python 2 and 3 compatible
+from future.builtins import map
+# Python 2 and 3: forward-compatible
+from future.builtins import range
# split strings by '.' and convert to numeric. Append some zeros
# because we need at least 4 digits for the hex conversion.
-minver = map(int, string.split('2.5', '.')) + [0, 0, 0]
+minver = list(map(int, '2.5'.split('.'))) + [0, 0, 0]
minverhex = 0
-for i in xrange(0, 4): minverhex = (minverhex << 8) + minver[i]
+for i in range(0, 4): minverhex = (minverhex << 8) + minver[i]
if sys.hexversion >= minverhex:
sys.exit( 0 )
else:
@@ -16540,15 +16544,15 @@
fi
- PYTHON_VERSION=`$PYTHON -c "import sys; print '.'.join(map(str, sys.version_info[:2]));"`
+ PYTHON_VERSION=`$PYTHON -c "from __future__ import print_function; import sys; print('.'.join(list(map(str, sys.version_info[:2]))));"`
- YODA_PYTHONPATH=`$PYTHON -c "import distutils.sysconfig; print distutils.sysconfig.get_python_lib(prefix='$prefix', plat_specific=True);"`
+ YODA_PYTHONPATH=`$PYTHON -c "from __future__ import print_function; import distutils.sysconfig; print(distutils.sysconfig.get_python_lib(prefix='$prefix', plat_specific=True));"`
## Test for Python header
if test -x "$PYTHON"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Python include path" >&5
$as_echo_n "checking for Python include path... " >&6; }
- python_incpath=`$PYTHON -c "import distutils.sysconfig; print distutils.sysconfig.get_python_inc();"`
+ python_incpath=`$PYTHON -c "from __future__ import print_function; import distutils.sysconfig; print(distutils.sysconfig.get_python_inc());"`
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $python_incpath" >&5
$as_echo "$python_incpath" >&6; }
python_header="$python_incpath/Python.h"
--- pyext/setup.py.in.orig 2016-09-30 09:07:58.000000000 +0200
+++ pyext/setup.py.in 2016-09-30 09:08:17.000000000 +0200
@@ -34,7 +34,7 @@
extns = [ext("util"), ext("core", statics=static_files, depends=core_depends)]
## Enable building of ROOT extension if ROOT is present
-if os.environ.has_key("BUILD_ROOTCOMPAT"):
+if "BUILD_ROOTCOMPAT" in os.environ:
try:
# import ROOT
# TODO: Need to test for and use root-config in configure
|
