From 391323a9a1e24e0ac36f6a78f34ca1f68cf4b084 Mon Sep 17 00:00:00 2001 From: Nabil Ghodbane Date: Fri, 23 Jul 2021 14:32:00 +0200 Subject: [PATCH] tuning root/omniOrb --- applications/SALOME-master-native.pyconf | 7 +++++-- products/root.pyconf | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/applications/SALOME-master-native.pyconf b/applications/SALOME-master-native.pyconf index 7f683bc..104e2c8 100644 --- a/applications/SALOME-master-native.pyconf +++ b/applications/SALOME-master-native.pyconf @@ -72,8 +72,8 @@ APPLICATION : netgen : '5.3.1_with_CAS_7.2' nlopt : '2.4.2' numpy : 'native' - omniORB : '4.2.4' - omniORBpy : '4.2.4' + omniORB : '4.2.2' + omniORBpy : '4.2.2' opencv : 'native' openVKL : '0.11.0' openturns: '1.16' @@ -230,6 +230,9 @@ __overwrite__ : # FD 34 qt5 package is qt5-qtbase-devel. __condition__ : "VARS.dist in ['FD34']" + 'APPLICATION.products.omniORB' : '4.2.4' + 'APPLICATION.products.omniORBpy': '4.2.4' + 'PRODUCTS.root.version_6_22_02.patches' : ['root-6.22.02.patch', 'root-6.22.02-gcc-11.0.patch'] 'PRODUCTS.qt.default.system_info.rpm' : [] 'PRODUCTS.qt.default.system_info.rpm_dev' : ["qt5-qtbase-devel"] } diff --git a/products/root.pyconf b/products/root.pyconf index 862f5bf..1783824 100644 --- a/products/root.pyconf +++ b/products/root.pyconf @@ -62,7 +62,7 @@ version_6_22_06_win: version_6_22_02: { get_source : "archive" - patches : ['root-6.22.02.patch', 'root-6.22.02-gcc-11.0.patch'] + patches : ['root-6.22.02.patch'] } version_6_22_02_win: -- 2.39.2