From e7e30036a1f7ccff704c45bd521b4923d6b18578 Mon Sep 17 00:00:00 2001 From: Nabil Ghodbane Date: Mon, 14 Mar 2022 10:00:54 +0100 Subject: [PATCH] PERSALYS on FD32 prerequisistes update --- applications/SALOME-master-native.pyconf | 2 +- products/Sphinx.pyconf | 9 +++++++++ products/salome_system.pyconf | 4 ++-- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/applications/SALOME-master-native.pyconf b/applications/SALOME-master-native.pyconf index b056cf5..5c87154 100644 --- a/applications/SALOME-master-native.pyconf +++ b/applications/SALOME-master-native.pyconf @@ -242,7 +242,7 @@ __overwrite__ : 'APPLICATION.products.opencv' : '3.2.0' 'APPLICATION.products.PyFMI' : {tag: '2.5', base: 'no', section: 'version_2_5_no_pip' } 'APPLICATION.products.openturns' : {tag: '1.17', base: 'no', section: 'version_1_17_FD32' } - + 'APPLICATION.products.Sphinx' : {tag: '1.7.6', base: 'no', section: 'version_1_7_6_no_pip' } } { # FD 34 qt5 package is qt5-qtbase-devel. diff --git a/products/Sphinx.pyconf b/products/Sphinx.pyconf index a3ce9db..de2af97 100644 --- a/products/Sphinx.pyconf +++ b/products/Sphinx.pyconf @@ -44,6 +44,15 @@ version_2_1_2: } +version_1_7_6_no_pip: +{ + properties: + { + incremental : "yes" + pip : "no" + } +} + version_1_1_3_to_1_2_3 : { name : "Sphinx" diff --git a/products/salome_system.pyconf b/products/salome_system.pyconf index 988707e..1903b9f 100644 --- a/products/salome_system.pyconf +++ b/products/salome_system.pyconf @@ -36,7 +36,7 @@ default : "CO7" : { rpm : ["lz4", "gsl", "libgeotiff", "giflib", "geos"] - rpm_dev : ["perl", "gsl-devel", "libpng-devel", "libtiff-devel", "libgeotiff-devel", "giflib-devel", "geos-devel" ] + rpm_dev : ["perl", "gsl-devel", "libpng-devel", "libtiff-devel", "libgeotiff-devel", "giflib-devel", "geos-devel"] } "CO8" : { @@ -51,7 +51,7 @@ default : "FD32" : { rpm : ["lz4", "gsl", "openmpi", "netcdf", "gdal"] - rpm_dev : ["perl-interpreter", "qt5-devel", "gsl-devel", "openmpi-devel", "netcdf-devel"] + rpm_dev : ["perl-interpreter", "qt5-devel", "gsl-devel", "openmpi-devel", "netcdf-devel", "protobuf-devel", "python3-protobuf"] } "FD34" : { -- 2.39.2