Thierry Thomas
d50519a41d
This implies:
- french /aster builds fine with clang, but it seg-faults: switched to Gcc
- ASTK is upgraded to 2019.0-1
- math/mumps is upgraded to 5.1.2-aster7
- TFEL/MFront is now required, but when the compilers of tfel and aster are
different, it cannot be linked
. recopopy science/tfel to science/tfel-edf and depends on science/tfel-edf
. science/tfel-edf is built by Gcc, from the sources included in Aster's
tarball
. register the conflicts
22 lines
1.1 KiB
Python
22 lines
1.1 KiB
Python
--- setup.py.orig 2020-10-26 15:54:27 UTC
|
|
+++ setup.py
|
|
@@ -485,12 +485,12 @@ def main():
|
|
[pythonXY, pythonXY + "m"],
|
|
paths=[pylib], prefshared=True, err=True)
|
|
cfg['PYTHON_LIBRARY'] = pylibrary
|
|
- cfg['PYTHON_LIBRARY_DIR'] = osp.dirname(pylibrary)
|
|
- pyinc = ftools.find_and_set(cfg, 'PYTHON_INCLUDE', "Python.h", typ='inc',
|
|
- paths=[osp.join(cfg['HOME_PYTHON'], 'include',
|
|
- pythonXY)],
|
|
- err=True)
|
|
- cfg['PYTHON_INCLUDE'] = osp.dirname(pyinc)
|
|
+ cfg['PYTHON_LIBRARY_DIR'] = osp.dirname(pylib)
|
|
+# pyinc = ftools.find_and_set(cfg, 'PYTHON_INCLUDE', "Python.h", typ='inc',
|
|
+# paths=[osp.join(cfg['HOME_PYTHON'], 'include',
|
|
+# pythonXY)],
|
|
+# err=True)
|
|
+# cfg['PYTHON_INCLUDE'] = osp.dirname(pyinc)
|
|
cfg['PYTHON_ALIAS'] = ''
|
|
if PY3:
|
|
py3tmpdir = tempfile.mkdtemp()
|