From 275ca32e342a5e50f39d760ff80f22263f88c7b9 Mon Sep 17 00:00:00 2001 From: Nabil Ghodbane Date: Mon, 26 Oct 2020 15:14:00 +0100 Subject: [PATCH] some MPI pyconf file cleanup --- applications/SALOME-9.6.0-MPI.pyconf | 60 ------------------- products/ParaView.pyconf | 3 +- ...MPI.patch => paraview.0012-VTKM_MPI.patch} | 0 3 files changed, 1 insertion(+), 62 deletions(-) rename products/patches/{paraview.0010-VTKM_MPI.patch => paraview.0012-VTKM_MPI.patch} (100%) diff --git a/applications/SALOME-9.6.0-MPI.pyconf b/applications/SALOME-9.6.0-MPI.pyconf index 49e0f98..26344a2 100644 --- a/applications/SALOME-9.6.0-MPI.pyconf +++ b/applications/SALOME-9.6.0-MPI.pyconf @@ -169,63 +169,3 @@ APPLICATION : single_install_dir : "no" } } -__overwrite__ : -[ - { - # GTK compilation issue - __condition__ : "VARS.dist in ['CO6']" - 'APPLICATION.products.opencv' : '2.4.13.5' - 'APPLICATION.products.tbb' : '4.4' - 'APPLICATION.products.llvm' : '3.9.1-clang' - 'APPLICATION.products.mesa' : '13.0.6' - 'PRODUCTS.embree.default.patches' : ['embree-3.5.2-centos6.patch'] - } - - { - # tbb as a mandatory native product since SMESH with tbb, not installed on DB8 (temporary) - __condition__ : "VARS.dist in ['DB08']" - 'APPLICATION.products.tbb' : '4.4' - } - - { - # - __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' - ] - } -] diff --git a/products/ParaView.pyconf b/products/ParaView.pyconf index a607f07..1900b76 100755 --- a/products/ParaView.pyconf +++ b/products/ParaView.pyconf @@ -73,14 +73,13 @@ version_5_8_0_win : version_5_8_0_MPI : { archive_info : {archive_name : "ParaView-5.8.0-lata.tar.gz"} - # two other LATA patches already included in archive patches : ['paraview.0003-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', - 'paraview.0010-VTKM_MPI.patch', + 'paraview.0012-VTKM_MPI.patch', 'pv_coincident.patch' ] } diff --git a/products/patches/paraview.0010-VTKM_MPI.patch b/products/patches/paraview.0012-VTKM_MPI.patch similarity index 100% rename from products/patches/paraview.0010-VTKM_MPI.patch rename to products/patches/paraview.0012-VTKM_MPI.patch -- 2.39.2