From 8bf160b724f1bf0507a90d861d8e5bcfbf0d302b Mon Sep 17 00:00:00 2001 From: Nabil Ghodbane Date: Thu, 15 Sep 2022 15:39:57 +0200 Subject: [PATCH] spns #29988: support Fedora 36 --- applications/SALOME-9.9.0-native.pyconf | 17 ++++++ applications/SALOME-master-native.pyconf | 18 +++++++ products/HEXABLOCK.pyconf | 5 ++ products/MEDCOUPLING.pyconf | 27 ++++++++++ products/ParaView.pyconf | 25 +++++++++ products/PyFMI.pyconf | 12 ++++- products/SHAPER.pyconf | 6 +++ products/compil_scripts/PERSALYS-v12.0.sh | 4 +- products/compil_scripts/PyFMI-2.6.sh | 46 ++++++++++++++++ products/compil_scripts/numpy-1.22.2.sh | 54 +++++++++++++++++++ products/compil_scripts/opencv.sh | 9 ++-- products/compil_scripts/openturns-1.18.sh | 2 +- products/medfile.pyconf | 8 +++ products/numpy.pyconf | 11 ++++ products/opencv.pyconf | 2 +- products/patches/SPNS-29988-numpy-1.22.patch | 12 +++++ .../SPNS-29988-opencv-3.2.0-persistence.patch | 26 +++++++++ products/root.pyconf | 6 +++ products/salome_system.pyconf | 5 ++ 19 files changed, 286 insertions(+), 9 deletions(-) create mode 100755 products/compil_scripts/PyFMI-2.6.sh create mode 100755 products/compil_scripts/numpy-1.22.2.sh create mode 100644 products/patches/SPNS-29988-numpy-1.22.patch create mode 100644 products/patches/SPNS-29988-opencv-3.2.0-persistence.patch diff --git a/applications/SALOME-9.9.0-native.pyconf b/applications/SALOME-9.9.0-native.pyconf index 4cfba8d..08640a7 100644 --- a/applications/SALOME-9.9.0-native.pyconf +++ b/applications/SALOME-9.9.0-native.pyconf @@ -276,4 +276,21 @@ __overwrite__ : 'APPLICATION.products.root' : {tag:'6.22.02', base: 'no', section: 'version_6_22_02_FD34' } 'APPLICATION.products.gdal' : {tag:'2.4.0', base: 'no', section: 'version_2_4_0_FD34' } # spns #29324 } + { + __condition__ : "VARS.dist in ['FD36']" + 'APPLICATION.products.opencv' : '3.2.0' + 'APPLICATION.products.omniORB' : '4.2.5' + 'APPLICATION.products.omniORBpy' : '4.2.5' + 'APPLICATION.products.qwt' : '6.1.6' + 'APPLICATION.products.nlopt' : '2.6' + 'APPLICATION.products.numpy' : {tag: '1.22.2', base: 'no', section: 'version_1_22_2' } + 'APPLICATION.products.PyFMI' : {tag: '2.5', base: 'no', section: 'version_2_5_no_pip' } + 'APPLICATION.products.netcdf' : '4.6.2' + 'APPLICATION.products.ParaView' : {tag: '5.9.0', base: 'no', section: 'version_5_9_0_FD36', hpc: 'yes'} + 'APPLICATION.products.root' : {tag: '6.22.02', base: 'no', section: 'version_6_22_02_FD36'} + 'APPLICATION.products.medfile' : {tag: '4.1.1', base: 'no', section: 'version_4_1_1_FD36'} + 'APPLICATION.products.MEDCOUPLING' : {tag:'V9_9_0', base: 'no', section: 'version_V9_9_0_MPI_FD36', hpc: 'yes'} + 'APPLICATION.products.HEXABLOCK' : {tag:'V9_9_0', base: 'no', section: 'version_V9_9_0_FD36', hpc: 'no'} + 'APPLICATION.products.SHAPER' : {tag:'V9_9_0', base: 'no', section: 'version_V9_9_0_FD36', hpc: 'no'} + } ] diff --git a/applications/SALOME-master-native.pyconf b/applications/SALOME-master-native.pyconf index 84c0a2a..5eed864 100644 --- a/applications/SALOME-master-native.pyconf +++ b/applications/SALOME-master-native.pyconf @@ -277,4 +277,22 @@ __overwrite__ : 'APPLICATION.products.root' : {tag:'6.22.02', base: 'no', section: 'version_6_22_02_FD34' } 'APPLICATION.products.gdal' : {tag:'2.4.0', base: 'no', section: 'version_2_4_0_FD34' } # spns #29324 } + { + __condition__ : "VARS.dist in ['FD36']" + 'APPLICATION.products.opencv' : '3.2.0' + 'APPLICATION.products.omniORB' : '4.2.5' + 'APPLICATION.products.omniORBpy' : '4.2.5' + 'APPLICATION.products.qwt' : '6.1.6' + 'APPLICATION.rm_products' : ['mesa'] + 'APPLICATION.products.nlopt' : '2.6' + 'APPLICATION.products.numpy' : {tag: '1.22.2', base: 'no', section: 'version_1_22_2' } + 'APPLICATION.products.PyFMI' : {tag: '2.5', base: 'no', section: 'version_2_5_no_pip' } + 'APPLICATION.products.netcdf' : '4.6.2' + 'APPLICATION.products.ParaView' : {tag: '5.9.0', base: 'no', section: 'version_5_9_0_FD36', hpc: 'yes'} + 'APPLICATION.products.root' : {tag: '6.22.02', base: 'no', section: 'version_6_22_02_FD36'} + 'APPLICATION.products.medfile' : {tag: '4.1.1', base: 'no', section: 'version_4_1_1_FD36'} + 'APPLICATION.products.MEDCOUPLING' : {tag:'master', base: 'no', section: 'version_V9_9_0_MPI_FD36', hpc: 'yes'} + 'APPLICATION.products.HEXABLOCK' : {tag:'master', base: 'no', section: 'version_V9_9_0_FD36', hpc: 'no'} + 'APPLICATION.products.SHAPER' : {tag:'master', base: 'no', section: 'version_V9_9_0_FD36', hpc: 'no'} + } ] diff --git a/products/HEXABLOCK.pyconf b/products/HEXABLOCK.pyconf index 6161a1b..e305066 100644 --- a/products/HEXABLOCK.pyconf +++ b/products/HEXABLOCK.pyconf @@ -102,3 +102,8 @@ version_V9_9_0_UB22_04 : { patches: ['SPNS-29880-HEXABLOCK_V9_9_0.patch'] } + +version_V9_9_0_FD36 : +{ + patches: ['SPNS-29880-HEXABLOCK_V9_9_0.patch'] +} diff --git a/products/MEDCOUPLING.pyconf b/products/MEDCOUPLING.pyconf index 15036d2..831fd98 100644 --- a/products/MEDCOUPLING.pyconf +++ b/products/MEDCOUPLING.pyconf @@ -241,6 +241,33 @@ version_V9_9_0_MPI_UB22_04: patches: ['SPNS-29880-MEDCOUPLING-V9_9_0.patch'] } +version_V9_9_0_MPI_FD36: +{ + cmake_options : "-DMEDCOUPLING_ENABLE_PYTHON=ON -DMEDCOUPLING_ENABLE_PARTITIONER=ON -DMEDCOUPLING_ENABLE_RENUMBER=ON -DMEDCOUPLING_PARTITIONER_METIS=ON -DMEDCOUPLING_PARTITIONER_PARMETIS=OFF -DMEDCOUPLING_PARTITIONER_SCOTCH=OFF -DMEDCOUPLING_PARTITIONER_PTSCOTCH=ON -DMEDCOUPLING_MICROMED=OFF -DMEDCOUPLING_USE_MPI=ON -DMEDCOUPLING_USE_64BIT_IDS=ON -DCMAKE_CXX_COMPILER:STRING=${MPI_CXX_COMPILER} -DCMAKE_C_COMPILER:STRING=${MPI_C_COMPILER} -DSCOTCH_ROOT_DIR=${SCOTCH_ROOT_DIR} -DPTSCOTCH_ROOT_DIR=${PTSCOTCH_ROOT_DIR} -DPTSCOTCH_INCLUDE_DIRS=${PTSCOTCH_INCLUDE_DIR}" + depend : [ + "boost", + "cppunit", + "Python", + "hdf5", + "medfile", + "scotch", + "docutils", + "libxml2", + "Sphinx", + "sphinxintl", + "setuptools", + "six", + "pytz", + "numpy", + "scipy", + "lapack", + "CONFIGURATION", + "openmpi" + ] + opt_depend : ["ParMetis", "metis"] + patches: ['SPNS-29880-MEDCOUPLING-V9_9_0.patch'] +} + version_V9_9_0_MPI_STD: { cmake_options : "-DMEDCOUPLING_ENABLE_PYTHON=ON -DMEDCOUPLING_ENABLE_PARTITIONER=OFF -DMEDCOUPLING_ENABLE_RENUMBER=ON -DMEDCOUPLING_PARTITIONER_METIS=OFF -DMEDCOUPLING_PARTITIONER_SCOTCH=ON -DMEDCOUPLING_PARTITIONER_PARMETIS=ON -DMEDCOUPLING_MICROMED=OFF -DMEDCOUPLING_USE_MPI=ON -DSALOME_USE_MPI=ON -DMEDCOUPLING_USE_64BIT_IDS=ON -DCMAKE_CXX_COMPILER:STRING=${MPI_CXX_COMPILER} -DCMAKE_C_COMPILER:STRING=${MPI_C_COMPILER}" diff --git a/products/ParaView.pyconf b/products/ParaView.pyconf index d8dadef..1c03938 100755 --- a/products/ParaView.pyconf +++ b/products/ParaView.pyconf @@ -303,6 +303,31 @@ version_5_9_0_MPI_LATA_64BITS_IDS : ] } +version_5_9_0_FD36 : +{ + compil_script : 'ParaView-5.9.0.sh' + archive_info : {archive_name : "ParaView-5.9.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-5.9-VTKM_MPI.patch', + 'paraview.0010-ParaView_CATALYST_cmake.patch', + 'paraview.0008-ParaView_coincident_rendering.patch', + 'paraview.0011-ParaView_protobuf_crash.patch', + 'paraview.0015-Paraview_VTKM_ioss.patch', + 'paraview-5.9.0-gcc.11.0.patch', + 'paraview.0017-VTK-openMPI-if-devtoolset.patch', + 'paraview.0018-spns-26351-autoconvert.patch', + 'paraview.0019-spns-26344-VTK-OpenMP.patch', + 'paraview.0020.findMPI.patch', + 'paraview.0021-FindGDAL.patch', + 'paraview-5.9.0-python-3.10.Py_REFCNT.patch' + ] +} + version_5_9_0_FD32 : { compil_script : 'ParaView-5.9.0.sh' diff --git a/products/PyFMI.pyconf b/products/PyFMI.pyconf index 9a34f36..1806fc6 100644 --- a/products/PyFMI.pyconf +++ b/products/PyFMI.pyconf @@ -15,7 +15,7 @@ default : { env_script : $name + ".py" } - depend : ["Python", "setuptools", "FMILibrary"] + depend : ["Python", "setuptools", "FMILibrary", "numpy"] source_dir : $APPLICATION.workdir + $VARS.sep + 'SOURCES' + $VARS.sep + $name build_dir : $APPLICATION.workdir + $VARS.sep + 'BUILD' + $VARS.sep + $name install_dir : 'base' @@ -26,6 +26,16 @@ default : } } +version_2_6_no_pip : +{ + compil_script : "PyFMI-2.6.sh" + properties: + { + incremental : "yes" + pip : "no" + } +} + version_2_5_no_pip : { compil_script : "PyFMI-2.5.sh" diff --git a/products/SHAPER.pyconf b/products/SHAPER.pyconf index 1f8145b..0748bba 100644 --- a/products/SHAPER.pyconf +++ b/products/SHAPER.pyconf @@ -57,6 +57,12 @@ version_V9_9_0_UB22_04: { patches : ['SPNS-29880-SHAPER-V9_9_0.patch'] } + +version_V9_9_0_FD36: +{ + patches : ['SPNS-29880-SHAPER-V9_9_0.patch'] +} + version_9_5_0_to_9_8_0 : { patches : ["patch_shaper_cursor_cross.diff"] diff --git a/products/compil_scripts/PERSALYS-v12.0.sh b/products/compil_scripts/PERSALYS-v12.0.sh index c7a193b..150ca65 100755 --- a/products/compil_scripts/PERSALYS-v12.0.sh +++ b/products/compil_scripts/PERSALYS-v12.0.sh @@ -32,8 +32,10 @@ elif [ "$SAT_qwt_IS_NATIVE" != "1" ]; then CMAKE_OPTIONS+=" -DQWT_INCLUDE_DIR=$QWT_ROOT_DIR/include" fi -if [[ $DIST_NAME == "CO" && $DIST_VERSION == "8" ]]; then +if [[ "$DIST_NAME$DIST_VERSION" == "8" ]]; then CMAKE_OPTIONS+=" -DUSE_SPHINX=OFF" # missing tex-preview LateX package for CentOS 8 +elif [ "$DIST_NAME$DIST_VERSION" == "FD36" ]; then + CMAKE_OPTIONS+=" -DUSE_SPHINX=OFF" # else CMAKE_OPTIONS+=" -DUSE_SPHINX=ON" fi diff --git a/products/compil_scripts/PyFMI-2.6.sh b/products/compil_scripts/PyFMI-2.6.sh new file mode 100755 index 0000000..152546c --- /dev/null +++ b/products/compil_scripts/PyFMI-2.6.sh @@ -0,0 +1,46 @@ +#!/bin/bash + +#!/bin/bash + +echo "##########################################################################" +echo "PyFMI " $VERSION +echo "##########################################################################" + +echo "*** build in SOURCE directory" + + +cd $BUILD_DIR +cp -R $SOURCE_DIR/* . + +rm -f $BUILD_DIR/src/pyfmi/*.c +#mkdir -p $PRODUCT_INSTALL/lib/python${PYTHON_VERSION}/site-packages +export PATH=$(pwd)/bin:$PATH +export PYTHONPATH=$(pwd):$PYTHONPATH +#export PYTHONPATH=${PRODUCT_INSTALL}/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH + +echo +echo "*** build with $PYTHONBIN" +$PYTHONBIN setup.py build +if [ $? -ne 0 ] +then + echo "ERROR on build" + exit 2 +fi + +echo +echo "*** install with $PYTHONBIN" +$PYTHONBIN setup.py install --prefix=$PRODUCT_INSTALL --fmil-home=$FMIL_HOME +if [ $? -ne 0 ] +then + echo "ERROR on install" + exit 3 +fi + +# ensure that lib is used +if [ -d "$PRODUCT_INSTALL/lib64" ]; then + echo "WARNING: renaming lib64 directory to lib" + mv $PRODUCT_INSTALL/lib64 $PRODUCT_INSTALL/lib +fi + +echo +echo "########## END" diff --git a/products/compil_scripts/numpy-1.22.2.sh b/products/compil_scripts/numpy-1.22.2.sh new file mode 100755 index 0000000..8ed3974 --- /dev/null +++ b/products/compil_scripts/numpy-1.22.2.sh @@ -0,0 +1,54 @@ +#!/bin/bash + +echo "##########################################################################" +echo "numpy" $VERSION +echo "##########################################################################" + + +mkdir -p $PRODUCT_INSTALL + +cd $SOURCE_DIR +rm -f site.cfg + +if [ "$SAT_lapack_IS_NATIVE" != "1" ]; then + echo "Lapack is embedded... Make numpy aware of it..." + echo "[ALL]" > site.cfg + echo "libraries = lapack,blas,cblas,lapacke,tmglib" >> site.cfg + echo "library_dirs = \$\{LAPACKHOME\}/lib" >> site.cfg + echo "include_dirs = \$\{LAPACKHOME\}/include" >> site.cfg +fi + +export PYTHONPATH=$SOURCE_DIR:$PYTHONPATH + +NUMPY_INSTALL=${PRODUCT_INSTALL}/lib/python${PYTHON_VERSION}/site-packages +mkdir -p ${NUMPY_INSTALL} +PYTHONPATH=${NUMPY_INSTALL}:${PYTHONPATH} + +echo +echo "*** setup.py build install" +$PYTHONBIN setup.py build install --prefix=${PRODUCT_INSTALL} --install-lib=${NUMPY_INSTALL} +if [ $? -ne 0 ] +then + echo "ERROR on setup build install" + rm -f site.cfg + exit 1 +fi +# the embedded versioneer.py fails to retrieve the correct version - presumably because of missing .git information +# let's fix this once for all - prevents openturns from not building. +cd ${NUMPY_INSTALL} +EGG_OLD=$(ls ) +EGG_DIR=numpy-$VERSION-py${PYTHON_VERSION}-linux-x86_64.egg +echo "====> $EGG_DIR" +mv numpy*-linux-x86_64.egg $EGG_DIR +ln -sf $EGG_DIR/numpy numpy +sed -i "s/0+unknown/$VERSION/g" $EGG_DIR/numpy/_version.py + +if [ -d ${PRODUCT_INSTALL}/local/bin ]; then + mv ${PRODUCT_INSTALL}/local/bin ${PRODUCT_INSTALL}/bin + rm -rf ${PRODUCT_INSTALL}/local +fi + +rm -f site.cfg +echo +echo "########## END" + diff --git a/products/compil_scripts/opencv.sh b/products/compil_scripts/opencv.sh index 2663e19..7a6e308 100755 --- a/products/compil_scripts/opencv.sh +++ b/products/compil_scripts/opencv.sh @@ -5,7 +5,6 @@ echo "opencv" $VERSION echo "##########################################################################" function version_ge() { test "$(echo "$@" | tr " " "\n" | sort -rV | head -n 1)" == "$1"; } -CPPSTD="\"-std=c++14\"" CMAKE_OPTIONS="" CMAKE_OPTIONS+=" -DCMAKE_INSTALL_PREFIX:STRING=${PRODUCT_INSTALL}" CMAKE_OPTIONS+=" -DCMAKE_BUILD_TYPE:STRING=Release" @@ -28,13 +27,13 @@ if version_ge $VERSION "3."; then CMAKE_OPTIONS+=" -DENABLE_PRECOMPILED_HEADERS:BOOL=OFF" CMAKE_OPTIONS+=" -DCMAKE_CXX_FLAGS=-fPIC" CMAKE_OPTIONS+=" -DCMAKE_C_FLAGS=-fPIC" - LINUX_DIST="$DIST_NAME$DIST_VERSION" LINUX_DISTRIBUTION="$DIST_NAME$DIST_VERSION" case $LINUX_DISTRIBUTION in - FD34|FD35|FD36|UB22*) - CMAKE_OPTIONS+=" -DCMAKE_CXX_FLAGS=${CPPSTD}" - ;; + FD34|FD35|FD36|UB22*) + CMAKE_OPTIONS+=" -DCMAKE_CXX_FLAGS=\"-std=c++14\"" + CMAKE_OPTIONS+=" -DCMAKE_CXX_STANDARD=14" + ;; esac CMAKE_OPTIONS+=" -DCMAKE_C_FLAGS=-fPIC" # diff --git a/products/compil_scripts/openturns-1.18.sh b/products/compil_scripts/openturns-1.18.sh index ec323e7..d180a40 100755 --- a/products/compil_scripts/openturns-1.18.sh +++ b/products/compil_scripts/openturns-1.18.sh @@ -34,7 +34,7 @@ fi # https://github.com/persalys/persalys/issues/745 LINUX_DISTRIBUTION="$DIST_NAME$DIST_VERSION" case $LINUX_DISTRIBUTION in - UB22*|CO8*|CO9*) + UB22*|CO8*|CO9*|FD36) echo "WARNING: switching OFF TBB support" CMAKE_OPTIONS+=" -DUSE_TBB=OFF" ;; diff --git a/products/medfile.pyconf b/products/medfile.pyconf index 81cf3d1..37c5e07 100644 --- a/products/medfile.pyconf +++ b/products/medfile.pyconf @@ -54,6 +54,14 @@ version_4_1_1_UB22_04 : patches: ['SPNS-29880-medfile.patch'] } +version_4_1_1_FD36 : +{ + compil_script : 'med-4.1.1.sh' + test_build : "make check" + build_depend : ['swig'] + patches: ['SPNS-29880-medfile.patch'] +} + # needed in order to screen with windows version - see below version_4_1_0 : { diff --git a/products/numpy.pyconf b/products/numpy.pyconf index 6ba91c6..1bfd952 100755 --- a/products/numpy.pyconf +++ b/products/numpy.pyconf @@ -37,6 +37,17 @@ default_win : depend : [ 'Python', 'setuptools', 'Cython'] } +version_1_22_2: +{ + properties: + { + incremental : "yes" + pip : "no" + } + compil_script : "numpy-1.22.2.sh" + patches: ['SPNS-29988-numpy-1.22.patch'] +} + version_1_16_4_win_dbg: { name : "numpy" diff --git a/products/opencv.pyconf b/products/opencv.pyconf index 12e7304..bb4105e 100644 --- a/products/opencv.pyconf +++ b/products/opencv.pyconf @@ -38,7 +38,7 @@ default_win: version_3_2_0 : { - patches : ["opencv-3.2.0-ccache.patch"] + patches : ["opencv-3.2.0-ccache.patch", "SPNS-29988-opencv-3.2.0-persistence.patch"] } version_3_2_0_win : diff --git a/products/patches/SPNS-29988-numpy-1.22.patch b/products/patches/SPNS-29988-numpy-1.22.patch new file mode 100644 index 0000000..11b5223 --- /dev/null +++ b/products/patches/SPNS-29988-numpy-1.22.patch @@ -0,0 +1,12 @@ +diff -Naur numpy-1.22.2_ref/setup.py numpy-1.22.2_dev/setup.py +--- numpy-1.22.2_ref/setup.py 2022-09-06 12:16:24.000000000 +0200 ++++ numpy-1.22.2_dev/setup.py 2022-09-06 14:20:07.476055406 +0200 +@@ -46,7 +46,7 @@ + # Needed for backwards code compatibility below and in some CI scripts. + # The version components are changed from ints to strings, but only VERSION + # seems to matter outside of this module and it was already a str. +-FULLVERSION = versioneer.get_version() ++FULLVERSION = '1.22.2' + + # Capture the version string: + # 1.22.0.dev0+ ... -> ISRELEASED == False, VERSION == 1.22.0 diff --git a/products/patches/SPNS-29988-opencv-3.2.0-persistence.patch b/products/patches/SPNS-29988-opencv-3.2.0-persistence.patch new file mode 100644 index 0000000..62cb5d5 --- /dev/null +++ b/products/patches/SPNS-29988-opencv-3.2.0-persistence.patch @@ -0,0 +1,26 @@ +diff -Naur opencv_ref/modules/core/src/persistence.cpp opencv_new/modules/core/src/persistence.cpp +--- opencv_ref/modules/core/src/persistence.cpp 2022-09-06 10:54:09.727231236 +0200 ++++ opencv_new/modules/core/src/persistence.cpp 2022-09-06 10:53:54.839309485 +0200 +@@ -7509,7 +7509,10 @@ + bool base64::base64_valid(uint8_t const * src, size_t off, size_t cnt) + { + /* check parameters */ +- if (src == 0 || src + off == 0) ++ /* initialize beginning and end */ ++ uint8_t const * beg = src + off; ++ uint8_t const * end = beg + cnt; ++ if (src == 0 || beg == 0) + return false; + if (cnt == 0U) + cnt = std::strlen(reinterpret_cast(src)); +@@ -7518,10 +7521,6 @@ + if (cnt & 0x3U) + return false; + +- /* initialize beginning and end */ +- uint8_t const * beg = src + off; +- uint8_t const * end = beg + cnt; +- + /* skip padding */ + if (*(end - 1U) == base64_padding) { + end--; diff --git a/products/root.pyconf b/products/root.pyconf index a23b576..707e58f 100644 --- a/products/root.pyconf +++ b/products/root.pyconf @@ -91,6 +91,12 @@ version_6_22_02_FD34: patches : ['root-6.22.02.patch', 'root-6.22.02-gcc-11.0.patch'] } +version_6_22_02_FD36: +{ + get_source : "archive" + patches : ['root-6.22.02.patch', 'root-6.22.02-gcc-11.0.patch'] +} + version_6_16_00: { get_source : "archive" diff --git a/products/salome_system.pyconf b/products/salome_system.pyconf index 13565f2..94aca22 100644 --- a/products/salome_system.pyconf +++ b/products/salome_system.pyconf @@ -58,6 +58,11 @@ default : rpm : ["lz4-libs", "gsl", "openmpi", "netcdf", "gdal"] rpm_dev : ["lz4-devel", "qt5-qtbase-devel", "gsl-devel", "openmpi-devel", "netcdf-devel", "gdal-devel", "texlive-dvipng"] } + "FD36" : + { + rpm : ["lz4-libs", "gsl", "openmpi", "netcdf", "gdal"] + rpm_dev : ["lz4-devel", "qt5-qtbase-devel", "gsl-devel", "openmpi-devel", "netcdf-devel", "gdal-devel"] + } "DB08" : { apt : ["libopenexr6", "libwebp5", "libgfortran3", "libilmbase6", "libevent-2.0-5", "libpng12-0", "libgcc-4.9-dev", -- 2.39.2