From bbb840a8b61c67452d9b92b4fcec858e83838cd7 Mon Sep 17 00:00:00 2001 From: Nabil Ghodbane Date: Thu, 17 Nov 2022 16:14:15 +0100 Subject: [PATCH] Fedora 37 support --- applications/SALOME-master-native.pyconf | 17 ++++++++++++++++- products/StaticMeshPlugin.pyconf | 6 ++++++ products/compil_scripts/PERSALYS-v13.0.sh | 2 ++ products/compil_scripts/opencv.sh | 2 +- products/compil_scripts/openturns-1.19.sh | 9 +++++---- products/medfile.pyconf | 8 ++++++++ products/opencv.pyconf | 5 +++++ products/root.pyconf | 6 ++++++ 8 files changed, 49 insertions(+), 6 deletions(-) diff --git a/applications/SALOME-master-native.pyconf b/applications/SALOME-master-native.pyconf index fb22946..9050daa 100644 --- a/applications/SALOME-master-native.pyconf +++ b/applications/SALOME-master-native.pyconf @@ -11,7 +11,7 @@ APPLICATION : debug : 'no' base : 'no' python3 : 'yes' - platform : ["FD32", "FD34", "FD36", "CO8", "DB10", "DB11", "UB20.04", "UB22.04"] + platform : ["FD32", "FD34", "FD36", "FD37", "CO8", "DB10", "DB11", "UB20.04", "UB22.04"] environ : { build : @@ -298,4 +298,19 @@ __overwrite__ : 'APPLICATION.products.medfile' : {tag: '4.1.1', base: 'no', section: 'version_4_1_1_FD36' } 'APPLICATION.products.StaticMeshPlugin' : {tag:'5.11.0', base: 'no', section: 'version_5_11_0_FD36' } } + + { + __condition__ : "VARS.dist in ['FD37']" + 'APPLICATION.products.opencv' : {tag: '3.2.0', base: 'no', section: 'version_3_2_0_FD37' } + 'APPLICATION.products.omniORB' : '4.2.5' + 'APPLICATION.products.omniORBpy' : '4.2.5' + 'APPLICATION.products.qwt' : '6.1.6' + 'APPLICATION.products.nlopt' : '2.6.0' + 'APPLICATION.products.netcdf' : '4.6.2' + 'APPLICATION.products.numpy' : {tag: '1.22.2', base: 'no', section: 'version_1_22_2' } + 'APPLICATION.products.PyFMI' : {tag: '2.6', base: 'no', section: 'version_2_6_no_pip' } + 'APPLICATION.products.root' : {tag: '6.22.02', base: 'no', section: 'version_6_22_02_FD37' } + 'APPLICATION.products.medfile' : {tag: '4.1.1', base: 'no', section: 'version_4_1_1_FD37' } + 'APPLICATION.products.StaticMeshPlugin' : {tag:'5.11.0', base: 'no', section: 'version_5_11_0_FD37' } + } ] diff --git a/products/StaticMeshPlugin.pyconf b/products/StaticMeshPlugin.pyconf index 1ec6030..7de0c18 100644 --- a/products/StaticMeshPlugin.pyconf +++ b/products/StaticMeshPlugin.pyconf @@ -76,6 +76,12 @@ version_5_11_0_DB11: patches: ['StaticMeshPlugin-5.11.0.p001.patch', 'StaticMeshPlugin-5.11.0.p002.patch'] } +version_5_11_0_FD37: +{ + archive_info : {archive_name : "StaticMeshPlugin-5.11.0-8801743.tar.gz"} + patches: ['StaticMeshPlugin-5.11.0.p001.patch', 'StaticMeshPlugin-5.11.0.p002.patch'] +} + version_5_11_0_FD36: { archive_info : {archive_name : "StaticMeshPlugin-5.11.0-8801743.tar.gz"} diff --git a/products/compil_scripts/PERSALYS-v13.0.sh b/products/compil_scripts/PERSALYS-v13.0.sh index 2353318..b035551 100755 --- a/products/compil_scripts/PERSALYS-v13.0.sh +++ b/products/compil_scripts/PERSALYS-v13.0.sh @@ -38,6 +38,8 @@ elif [[ "$DIST_NAME$DIST_VERSION" == "CO7" ]]; then CMAKE_OPTIONS+=" -DUSE_SPHINX=OFF" # missing tex-preview LateX package for CentOS 7 - à installer elif [ "$DIST_NAME$DIST_VERSION" == "FD36" ]; then CMAKE_OPTIONS+=" -DUSE_SPHINX=OFF" # +elif [ "$DIST_NAME$DIST_VERSION" == "FD37" ]; then + CMAKE_OPTIONS+=" -DUSE_SPHINX=OFF" # else CMAKE_OPTIONS+=" -DUSE_SPHINX=ON" fi diff --git a/products/compil_scripts/opencv.sh b/products/compil_scripts/opencv.sh index 94a0f45..9ec9546 100755 --- a/products/compil_scripts/opencv.sh +++ b/products/compil_scripts/opencv.sh @@ -35,7 +35,7 @@ if version_ge $VERSION "3."; then CMAKE_OPTIONS+=" -DCMAKE_C_FLAGS=-fPIC" LINUX_DISTRIBUTION="$DIST_NAME$DIST_VERSION" case $LINUX_DISTRIBUTION in - FD34|FD35|FD36|UB22*) + FD34|FD35|FD36|FD37|UB22*) CMAKE_OPTIONS+=" -DCMAKE_CXX_FLAGS=\"-std=c++14\"" CMAKE_OPTIONS+=" -DCMAKE_CXX_STANDARD=14" ;; diff --git a/products/compil_scripts/openturns-1.19.sh b/products/compil_scripts/openturns-1.19.sh index 6e62bf8..bca4168 100755 --- a/products/compil_scripts/openturns-1.19.sh +++ b/products/compil_scripts/openturns-1.19.sh @@ -35,7 +35,7 @@ fi # https://github.com/persalys/persalys/issues/745 LINUX_DISTRIBUTION="$DIST_NAME$DIST_VERSION" case $LINUX_DISTRIBUTION in - UB22*|CO8*|CO9*|FD36) + UB22*|CO8*|CO9*|FD36|FD37) echo "WARNING: switching OFF TBB support" CMAKE_OPTIONS+=" -DUSE_TBB=OFF" ;; @@ -403,12 +403,13 @@ if [[ -d "$SOURCE_DIR/otfftw-0.12" ]]; then FD32) SITE_PATCH=/usr/lib/pypy/dist-packages/setuptools/site-patch.py ;; + FD34) + SITE_PATCH=$SOURCE_DIR/addons/site-patch.py + ;; FD36) - ###SITE_PATCH= SITE_PATCH=$SOURCE_DIR/addons/site-patch.py ;; - FD34) - ###SITE_PATCH= + FD37) SITE_PATCH=$SOURCE_DIR/addons/site-patch.py ;; CO8*) diff --git a/products/medfile.pyconf b/products/medfile.pyconf index 6a34a57..a13ebbe 100644 --- a/products/medfile.pyconf +++ b/products/medfile.pyconf @@ -60,6 +60,14 @@ version_4_1_1_UB22_04 : patches: ['SPNS-29880-medfile.patch'] } +version_4_1_1_FD37 : +{ + compil_script : 'med-4.1.1.sh' + test_build : "make check" + build_depend : ['swig'] + patches: ['SPNS-29880-medfile.patch'] +} + version_4_1_1_FD36 : { compil_script : 'med-4.1.1.sh' diff --git a/products/opencv.pyconf b/products/opencv.pyconf index 72114e1..eb4ef6e 100644 --- a/products/opencv.pyconf +++ b/products/opencv.pyconf @@ -41,6 +41,11 @@ version_3_2_0 : patches : ["opencv-3.2.0-ccache.patch", "SPNS-29988-opencv-3.2.0-persistence.patch", "opencv-3.2.0-python2-cmake.patch"] } +version_3_2_0_FD37 : +{ + patches : ["opencv-3.2.0-ccache.patch", "SPNS-29988-opencv-3.2.0-persistence.patch", "SPNS-29988-opencv-3.2.0-cv2.patch"] +} + version_3_2_0_FD36 : { patches : ["opencv-3.2.0-ccache.patch", "SPNS-29988-opencv-3.2.0-persistence.patch", "SPNS-29988-opencv-3.2.0-cv2.patch"] diff --git a/products/root.pyconf b/products/root.pyconf index 707e58f..3cb09c8 100644 --- a/products/root.pyconf +++ b/products/root.pyconf @@ -97,6 +97,12 @@ version_6_22_02_FD36: patches : ['root-6.22.02.patch', 'root-6.22.02-gcc-11.0.patch'] } +version_6_22_02_FD37: +{ + get_source : "archive" + patches : ['root-6.22.02.patch', 'root-6.22.02-gcc-11.0.patch'] +} + version_6_16_00: { get_source : "archive" -- 2.39.2