From 893465a048341ae79231688e462bccaea4ba100d Mon Sep 17 00:00:00 2001 From: Nabil Ghodbane Date: Thu, 1 Oct 2020 15:20:12 +0200 Subject: [PATCH] SALOME-master 64 bits IDs - update configurations for all nodes --- applications/SALOME-master-int64.pyconf | 47 +++++++++++++++++++++---- 1 file changed, 41 insertions(+), 6 deletions(-) diff --git a/applications/SALOME-master-int64.pyconf b/applications/SALOME-master-int64.pyconf index 62edb34..c047830 100644 --- a/applications/SALOME-master-int64.pyconf +++ b/applications/SALOME-master-int64.pyconf @@ -61,7 +61,7 @@ APPLICATION : matplotlib : '2.2.2' medfile : {section: 'default_Autotools', tag: '4.1.0'} mesa : '19.0.8' - MeshGems : '2.10-4' + MeshGems : '2.11-5' metis : '5.1.0' netgen : '5.3.1_with_CAS_7.2' nlopt : '2.4.2' @@ -108,7 +108,7 @@ APPLICATION : 'SHAPER' 'SHAPERSTUDY' 'RESTRICTED' - 'LIBBATCH' : {tag :'V2_4_3rc2'} + 'LIBBATCH' : {tag :'V2_4_3'} 'KERNEL' 'MEDCOUPLING' : {tag : 'master', section: 'default_int64'} # this will trigger other modules as int64 'GUI' @@ -185,9 +185,44 @@ __overwrite__ : } { - # - __condition__ : "VARS.dist in ['FD26']" - 'APPLICATION.products.tbb' : '2017-7' - 'APPLICATION.products.embree' : '3.5.2' + # + __condition__ : "VARS.dist in ['FD26']" + 'APPLICATION.products.tbb' : '2017-7' + 'APPLICATION.products.embree' : '3.5.2' + } + + { + # + __condition__ : "VARS.dist in ['UB20.04']" + 'PRODUCTS.qt.version_5_9_1.patches' : ['qt-5.9.1-UB20-FD32-socketcanbackend.patch'] + } + + { + __condition__ : "VARS.dist in ['FD32']" + 'APPLICATION.products.scipy' : '1.5.2' # gcc https://github.com/scipy/scipy/issues/11611 - either patch numpy to include -fallow-argument-mismatch or move to that version + # see https://bugs.gentoo.org/708730 + 'PRODUCTS.llvm.version_8_0_1_clang.patches' : ['llvm-8.0.1-clang-FD32.patch'] + 'PRODUCTS.qt.version_5_9_1.patches' : ['qt-5.9.1-UB20-FD32-socketcanbackend.patch', 'qt-5.9.1-mapbox-FD32.patch'] + 'PRODUCTS.mesa.version_19_0_8.patches' : ['mesa-19.0.8-debug_symbol.patch'] + 'PRODUCTS.ParaView.version_5_8_0.patches' : ['paraview.0010-ParaViewClient.patch', + 'paraview.0004-ParaView_hdf5.patch', + 'paraview.0005-ParaView_find_cgns.patch', + 'paraview.0006-ParaView_find_libxml2.patch', + 'paraview.0007-ParaView_find_freetype.patch', + 'paraview.0009-ParaView_volume_mapper.patch', + 'pv_coincident.patch' + ] + } + + { + __condition__ : "VARS.dist in ['CO8']" + 'PRODUCTS.ParaView.version_5_8_0.patches' : ['paraview.0010-ParaViewClient.patch', + 'paraview.0004-ParaView_hdf5.patch', + 'paraview.0005-ParaView_find_cgns.patch', + 'paraview.0006-ParaView_find_libxml2.patch', + 'paraview.0007-ParaView_find_freetype.patch', + 'paraview.0009-ParaView_volume_mapper.patch', + 'pv_coincident.patch' + ] } ] -- 2.39.2