From 8287a1692fb02a2e5c41ac95de870c8d97b45ec2 Mon Sep 17 00:00:00 2001 From: Nabil Ghodbane Date: Fri, 12 Feb 2021 18:16:54 +0100 Subject: [PATCH] tbb: use 4.4 since tbb-system too old --- applications/SALOME-master.pyconf | 83 +------------------------------ 1 file changed, 1 insertion(+), 82 deletions(-) diff --git a/applications/SALOME-master.pyconf b/applications/SALOME-master.pyconf index 5fa404a..04fe993 100644 --- a/applications/SALOME-master.pyconf +++ b/applications/SALOME-master.pyconf @@ -102,7 +102,7 @@ APPLICATION : sphinx_rtd_theme : '0.4.3' sphinxintl: '0.9.10' swig : '3.0.12' - tbb : 'native' + tbb : '4.4' tcl : '8.6.0' tk : '8.6.0' urllib3 : '1.23' @@ -173,84 +173,3 @@ APPLICATION : single_install_dir : "yes" } } -__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'] - } - - { - # Build Fedora 30 with less permissive compilation flags (see spns #18962) - __condition__ : "VARS.dist in ['FD30']" - 'PRODUCTS.LIBBATCH.default.cmake_options' : "-DLIBBATCH_DEBUG_WARNINGS=ON -DSWIG_EXECUTABLE=${SWIG_ROOT_DIR}/bin/swig" - 'PRODUCTS.CONFIGURATION.default.patches' : ['CONFIGURATION-SALOME-DEBUG-WARNINGS.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'] - } - - { - __condition__ : "VARS.dist in ['CO7'] and APPLICATION.environ.build.VTK_SMP_IMPLEMENTATION_TYPE == 'OpenMP'" - 'PRODUCTS.ParaView.version_5_8_0.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.0011-vtkSMPSelection.patch', - 'pv_coincident.patch', - 'paraview-0012-LATA_64BITS_IDS.patch' - ] - } - - { - __condition__ : "VARS.dist in ['CO7'] and APPLICATION.environ.build.VTK_SMP_IMPLEMENTATION_TYPE == 'TBB'" - 'APPLICATION.products.tbb' : '4.4' - } - - { - # Adapt Paraview CMake files to be compliant with recent distributions - __condition__ : "VARS.dist in ['FD30', 'FD32', 'CO8']" - 'PRODUCTS.ParaView.version_5_8_0.patches' : ['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-ParaViewClient.patch', - 'paraview.0010-ParaView_find_python.patch', - 'pv_coincident.patch', - 'paraview-0012-LATA_64BITS_IDS.patch' - ] - } -] -- 2.39.2