diff options
| author | Michael Gmelin <grembo@FreeBSD.org> | 2015-12-27 17:40:15 +0000 |
|---|---|---|
| committer | Michael Gmelin <grembo@FreeBSD.org> | 2015-12-27 17:40:15 +0000 |
| commit | ee955dc4f8a9df0b1f005631a7eaa747d361e466 (patch) | |
| tree | ffef14dad47251519a39a6d1b19c418777340f56 /devel/ice/files/patch-scripts-TestUtil.py | |
| parent | Remove PYTHON_PORTVERSION guards since it's no longer exported (diff) | |
Update ice ports to 3.6.1 and switch to new unit test framework.
Approved by: mentors (implicit)
Notes
Notes:
svn path=/head/; revision=404582
Diffstat (limited to 'devel/ice/files/patch-scripts-TestUtil.py')
| -rw-r--r-- | devel/ice/files/patch-scripts-TestUtil.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/devel/ice/files/patch-scripts-TestUtil.py b/devel/ice/files/patch-scripts-TestUtil.py index bd301767de25..e014e83c7af5 100644 --- a/devel/ice/files/patch-scripts-TestUtil.py +++ b/devel/ice/files/patch-scripts-TestUtil.py @@ -26,15 +26,15 @@ def getCppCompiler(): compiler = "" if os.environ.get("CPP_COMPILER", "") != "": -@@ -311,7 +330,7 @@ - if(p.wait() != 0): +@@ -324,7 +324,7 @@ print("uname failed:\n" + p.stdout.read().strip()) sys.exit(1) -- if p.stdout.readline().decode('UTF-8').strip() == "x86_64" and os.environ.get("LP64", "") != "no": -+ if p.stdout.readline().decode('UTF-8').strip() in ["x86_64", "amd64"] and os.environ.get("LP64", "") != "no": + line = p.stdout.readline().decode('UTF-8').strip() +- if line == "x86_64" and os.environ.get("LP64", "") != "no": ++ if line in ["x86_64", "amd64"] and os.environ.get("LP64", "") != "no": x64 = True - - # + elif line == "armv7l": + armv7l = True @@ -1887,7 +1906,7 @@ if lang == "java": addLdPath(os.path.join(getIceDir("cpp"), "bin", "x64" if x64 else ""), env) # Add bin for db53_vc100.dll |