From 980ab36f3ec7569579c1a010dcb3f46f528a5af5 Mon Sep 17 00:00:00 2001 From: Nabil Ghodbane Date: Mon, 26 Aug 2024 15:27:41 +0200 Subject: [PATCH] os #41276: MEDCOUPLING: FD38, UB22.04 and DB12 builds --- applications/MEDCOUPLING-9.13.0.pyconf | 16 ++++++++++++++++ applications/MEDCOUPLING-master.pyconf | 16 ++++++++++++++++ products/boost.pyconf | 6 ++++++ 3 files changed, 38 insertions(+) diff --git a/applications/MEDCOUPLING-9.13.0.pyconf b/applications/MEDCOUPLING-9.13.0.pyconf index 73facb3..1783a44 100644 --- a/applications/MEDCOUPLING-9.13.0.pyconf +++ b/applications/MEDCOUPLING-9.13.0.pyconf @@ -97,4 +97,20 @@ __overwrite__ : __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 } + { + __condition__ : "VARS.dist in ['UB22.04']" + 'APPLICATION.products.boost' : {tag: '1.71.0', base: 'no', section: 'version_1_71_0_UB22_04'} + } + { + __condition__ : "VARS.dist in ['DB12']" + 'APPLICATION.products.boost' : {tag: '1.71.0', base: 'no', section: 'version_1_71_0_DB12'} + } + { + __condition__ : "VARS.dist in ['FD36']" + 'APPLICATION.products.boost' : {tag: '1.71.0', base: 'no', section: 'version_1_71_0_FD36'} + } + { + __condition__ : "VARS.dist in ['FD38']" + 'APPLICATION.products.boost' : {tag: '1.71.0', base: 'no', section: 'version_1_71_0_FD38'} + } ] diff --git a/applications/MEDCOUPLING-master.pyconf b/applications/MEDCOUPLING-master.pyconf index bc2dc57..5731093 100644 --- a/applications/MEDCOUPLING-master.pyconf +++ b/applications/MEDCOUPLING-master.pyconf @@ -97,4 +97,20 @@ __overwrite__ : __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 } + { + __condition__ : "VARS.dist in ['UB22.04']" + 'APPLICATION.products.boost' : {tag: '1.71.0', base: 'no', section: 'version_1_71_0_UB22_04'} + } + { + __condition__ : "VARS.dist in ['DB12']" + 'APPLICATION.products.boost' : {tag: '1.71.0', base: 'no', section: 'version_1_71_0_DB12'} + } + { + __condition__ : "VARS.dist in ['FD36']" + 'APPLICATION.products.boost' : {tag: '1.71.0', base: 'no', section: 'version_1_71_0_FD36'} + } + { + __condition__ : "VARS.dist in ['FD38']" + 'APPLICATION.products.boost' : {tag: '1.71.0', base: 'no', section: 'version_1_71_0_FD38'} + } ] diff --git a/products/boost.pyconf b/products/boost.pyconf index 980a86e..96373e7 100644 --- a/products/boost.pyconf +++ b/products/boost.pyconf @@ -39,6 +39,12 @@ version_1_71_0 : compil_script : "boost-1.71.0.sh" } +version_1_71_0_DB12 : +{ + compil_script : "boost-1.71.0.sh" + patches : ['boost-1.71-pthread-gcc-11.patch'] +} + version_1_71_0_UB22_04 : { compil_script : "boost-1.71.0.sh" -- 2.39.2