llvm 8.0.1 fedora 34 compliance

[tools/sat_salome.git] / products / root.pyconf

diff --git a/products/root.pyconf b/products/root.pyconf
index 1118a06420f5c7ea07628ba37de3a50a3cea667d..6b4aa8cafdb87b700b71d07240598f907c4ed2cb 100644 (file)
--- a/products/root.pyconf
+++ b/products/root.pyconf
@@ -24,8 +24,17 @@ default :
     }
 }
 
+default_win:
+{
+    build_source : "script"
+    compil_script :  "root.bat"
+    depend : ['Python', 'Cython', 'numpy']
+    patches : []
+}
+
 version_6_24_00:
 {
+    get_source : "archive"
     patches : []
 }
 
@@ -46,7 +55,7 @@ version_6_22_06:
 version_6_22_06_win:
 {
     build_source : "script"
-    compil_script :  "root.bat"
+    compil_script :  "root-6.22.bat"
     archive_info : {archive_name : "root_v6.22.06.win32.vc16.tar.gz"}
     patches : []
 }
@@ -60,12 +69,19 @@ version_6_22_02:
 version_6_22_02_win:
 {
     build_source : "script"
-    compil_script :  "root.bat"
+    compil_script :  "root-6.22.bat"
     archive_info : {archive_name : "root_v6.22.02.win32.vc16.tar.gz"}
     depend : ['Python', 'boost', 'freetype', 'freeimage']
     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_16_00:
 {
     get_source : "archive"
@@ -76,6 +92,6 @@ version_6_16_00_win:
 
     archive_info : {archive_name : "root_v6.16.00-windows.tar.gz"}
     build_source : "script"
-    compil_script :  "root.bat"
+    compil_script :  "root-6.16.bat"
 }