Salome HOME
projects
/
tools
/
sat_salome.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
merge from master
[tools/sat_salome.git]
/
products
/
root.pyconf
diff --git
a/products/root.pyconf
b/products/root.pyconf
index d89de2d99f4cefc9d03ad67469030db061637b3e..707e58f6358d91a5c0aa7abc3c7c75322aaa0518 100644
(file)
--- a/
products/root.pyconf
+++ b/
products/root.pyconf
@@
-66,6
+66,15
@@
version_6_22_02:
patches : ['root-6.22.02.patch']
}
patches : ['root-6.22.02.patch']
}
+version_6_22_02_UB22_04:
+{
+ get_source : "archive"
+ patches : ['root-6.22.02.patch',
+ 'root-6.22-afterImage.UB22.patch',
+ 'root-6.22-string_view.UB22.patch'
+ ]
+}
+
version_6_22_02_win:
{
build_source : "script"
version_6_22_02_win:
{
build_source : "script"
@@
-75,6
+84,19
@@
version_6_22_02_win:
patches : []
}
patches : []
}
+# these two patches cannot be merged - compilation issue on UB20 otherwise
+version_6_22_02_FD34:
+{
+ get_source : "archive"
+ 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"
version_6_16_00:
{
get_source : "archive"