diff options
Diffstat (limited to 'french/aster/files/patch-products.py')
| -rw-r--r-- | french/aster/files/patch-products.py | 35 |
1 files changed, 12 insertions, 23 deletions
diff --git a/french/aster/files/patch-products.py b/french/aster/files/patch-products.py index 5528d7523d0f..c3e39de90a32 100644 --- a/french/aster/files/patch-products.py +++ b/french/aster/files/patch-products.py @@ -1,17 +1,16 @@ ---- products.py.orig 2018-08-02 11:02:24 UTC +--- products.py.orig 2019-10-01 12:45:34 UTC +++ products.py -@@ -118,8 +118,8 @@ def setup_hdf5(dep, summary, **kargs): - - actions=( - ('IsInstalled', { 'filename' : -- [osp.join('__setup.installdir__', 'lib', 'libhdf5.a'), -- osp.join('__setup.installdir__', 'include', 'hdf5.h')] -+ [osp.join('__setup.installdir__', 'lib', 'libhdf5-18.a'), -+ osp.join('__setup.installdir__', 'include/hdf5-18', 'hdf5.h')] - } ), - ('Extract' , {}), - # gcc>=4.9 not supported by configure, should not use -ansi -@@ -674,7 +674,8 @@ def setup_aster(dep, summary, **kargs): +@@ -637,7 +637,8 @@ def setup_mumps(dep, summary, **kargs): + 'capturestderr' : False, + }), + ('Make' , { +- 'command' : '%(PYTHON_ALIAS)s ; ./waf build --jobs=1' % cfg, ++ # Work-around on FreeBSD: MAKE_JOBS_UNSAFE + -vvv to get full logs in setup.dbg ++ 'command' : '%(PYTHON_ALIAS)s ; ./waf build -vvv --jobs=1' % cfg, + 'capturestderr' : False, + }), + ('Install', { +@@ -691,7 +692,8 @@ def setup_aster(dep, summary, **kargs): 'HOME_MUMPS', 'HOME_MPI', 'INCLUDE_MUMPS', 'HOME_METIS', 'HOME_MED', 'HOME_HDF', 'HOME_MFRONT', #'HOME_GMSH', 'HOME_HOMARD', optional @@ -21,13 +20,3 @@ reqobj=['file:?ASTER_ROOT?/bin/as_run', 'file:?ASTER_ROOT?/etc/codeaster/profile.sh'], ) -@@ -726,7 +727,8 @@ def setup_aster(dep, summary, **kargs): - 'capturestderr' : False, - }), - ('Make' , { -- 'command' : './waf build', -+ # Work-around on FreeBSD: MAKE_JOBS_UNSAFE + -vvv to get full logs in setup.dbg -+ 'command' : './waf build -vvv --jobs=1', - 'capturestderr' : False, - }), - ('Install' , { |