Skip to content

Commit 386cbaf

Browse files
tvamitvami
committed
Add patches
1 parent 9b3ecaa commit 386cbaf

11 files changed

Lines changed: 410 additions & 4 deletions

File tree

‎ci/interop/v3.3.0.patch‎

Lines changed: 47 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,54 @@ index e418c42..79ed3a3 100644
55
+++ b/Conditions/include/Conditions/SimpleTableCondition.h
66
@@ -7,6 +7,7 @@
77
#define FRAMEWORK_SIMPLETABLECONDITION_H_
8-
8+
99
#include <vector>
1010
+#include <cstdint>
11-
11+
1212
#include "Framework/ConditionsObject.h"
1313
#include "Framework/Exception/Exception.h"
14+
diff --git a/DetDescr/CMakeLists.txt b/DetDescr/CMakeLists.txt
15+
--- a/DetDescr/CMakeLists.txt
16+
+++ b/DetDescr/CMakeLists.txt
17+
@@ -17,32 +17,27 @@
18+
option(BUILD_DETECTORID_BINDINGS "Build the python bindings for the the DetDescr/DetectorID components" ON)
19+
if(BUILD_DETECTORID_BINDINGS)
20+
+ cmake_policy(SET CMP0167 NEW)
21+
find_package(Python COMPONENTS Development)
22+
23+
- message("Looking for libboost_python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}")
24+
- find_package(Boost QUIET COMPONENTS python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR})
25+
+ message("Looking for libboost_python${Python_VERSION_MAJOR}${Python_VERSION_MINOR}")
26+
+ find_package(Boost QUIET COMPONENTS python${Python_VERSION_MAJOR}${Python_VERSION_MINOR})
27+
# libboost_python3 style libraries
28+
if (NOT Boost_FOUND)
29+
- message("Looking for libboost_python${PYTHON_VERSION_MAJOR}")
30+
- find_package(Boost QUIET COMPONENTS python${PYTHON_VERSION_MAJOR})
31+
+ message("Looking for libboost_python${Python_VERSION_MAJOR}")
32+
+ find_package(Boost QUIET COMPONENTS python${Python_VERSION_MAJOR})
33+
endif()
34+
35+
- # libboost_python style libraries
36+
- if (NOT Boost_FOUND)
37+
- message("Looking for libboost_python")
38+
- find_package(Boost QUIET COMPONENTS system thread python)
39+
- endif()
40+
-
41+
# libboost_python-py36 style libraries
42+
if (NOT Boost_FOUND)
43+
- message("Looking for libboost_python-py${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}")
44+
- find_package(Boost QUIET COMPONENTS python-py${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR})
45+
+ message("Looking for libboost_python-py${Python_VERSION_MAJOR}${Python_VERSION_MINOR}")
46+
+ find_package(Boost QUIET COMPONENTS python-py${Python_VERSION_MAJOR}${Python_VERSION_MINOR})
47+
endif()
48+
49+
# libboost_python3-py36 style libraries
50+
if (NOT Boost_FOUND)
51+
- message("Looking for libboost_python3-py${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}")
52+
- find_package(Boost QUIET COMPONENTS python3-py${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR})
53+
+ message("Looking for libboost_python3-py${Python_VERSION_MAJOR}${Python_VERSION_MINOR}")
54+
+ find_package(Boost QUIET COMPONENTS python3-py${Python_VERSION_MAJOR}${Python_VERSION_MINOR})
55+
endif()
56+
57+
# Nothing worked
58+
if (NOT Boost_FOUND)

‎ci/interop/v3.4.0.patch‎

Lines changed: 47 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,55 @@ index 467d8b9..632de04 100644
44
--- a/Conditions/include/Conditions/SimpleTableCondition.h
55
+++ b/Conditions/include/Conditions/SimpleTableCondition.h
66
@@ -8,6 +8,7 @@
7-
7+
88
#include <vector>
99
#include <ostream>
1010
+#include <cstdint>
11-
11+
1212
#include "Framework/ConditionsObject.h"
1313
#include "Framework/Exception/Exception.h"
14+
diff --git a/DetDescr/CMakeLists.txt b/DetDescr/CMakeLists.txt
15+
--- a/DetDescr/CMakeLists.txt
16+
+++ b/DetDescr/CMakeLists.txt
17+
@@ -17,32 +17,27 @@
18+
option(BUILD_DETECTORID_BINDINGS "Build the python bindings for the the DetDescr/DetectorID components" ON)
19+
if(BUILD_DETECTORID_BINDINGS)
20+
+ cmake_policy(SET CMP0167 NEW)
21+
find_package(Python COMPONENTS Development)
22+
23+
- message("Looking for libboost_python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}")
24+
- find_package(Boost QUIET COMPONENTS python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR})
25+
+ message("Looking for libboost_python${Python_VERSION_MAJOR}${Python_VERSION_MINOR}")
26+
+ find_package(Boost QUIET COMPONENTS python${Python_VERSION_MAJOR}${Python_VERSION_MINOR})
27+
# libboost_python3 style libraries
28+
if (NOT Boost_FOUND)
29+
- message("Looking for libboost_python${PYTHON_VERSION_MAJOR}")
30+
- find_package(Boost QUIET COMPONENTS python${PYTHON_VERSION_MAJOR})
31+
+ message("Looking for libboost_python${Python_VERSION_MAJOR}")
32+
+ find_package(Boost QUIET COMPONENTS python${Python_VERSION_MAJOR})
33+
endif()
34+
35+
- # libboost_python style libraries
36+
- if (NOT Boost_FOUND)
37+
- message("Looking for libboost_python")
38+
- find_package(Boost QUIET COMPONENTS system thread python)
39+
- endif()
40+
-
41+
# libboost_python-py36 style libraries
42+
if (NOT Boost_FOUND)
43+
- message("Looking for libboost_python-py${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}")
44+
- find_package(Boost QUIET COMPONENTS python-py${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR})
45+
+ message("Looking for libboost_python-py${Python_VERSION_MAJOR}${Python_VERSION_MINOR}")
46+
+ find_package(Boost QUIET COMPONENTS python-py${Python_VERSION_MAJOR}${Python_VERSION_MINOR})
47+
endif()
48+
49+
# libboost_python3-py36 style libraries
50+
if (NOT Boost_FOUND)
51+
- message("Looking for libboost_python3-py${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}")
52+
- find_package(Boost QUIET COMPONENTS python3-py${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR})
53+
+ message("Looking for libboost_python3-py${Python_VERSION_MAJOR}${Python_VERSION_MINOR}")
54+
+ find_package(Boost QUIET COMPONENTS python3-py${Python_VERSION_MAJOR}${Python_VERSION_MINOR})
55+
endif()
56+
57+
# Nothing worked
58+
if (NOT Boost_FOUND)

‎ci/interop/v4.0.5.patch‎

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,59 @@ index d34d930d..b69f81c7 100644
1010

1111
#include "Framework/ConditionsObject.h"
1212
#include "Framework/Exception/Exception.h"
13+
diff --git a/DetDescr/CMakeLists.txt b/DetDescr/CMakeLists.txt
14+
--- a/DetDescr/CMakeLists.txt
15+
+++ b/DetDescr/CMakeLists.txt
16+
@@ -17,32 +17,27 @@
17+
option(BUILD_DETECTORID_BINDINGS "Build the python bindings for the the DetDescr/DetectorID components" ON)
18+
if(BUILD_DETECTORID_BINDINGS)
19+
+ cmake_policy(SET CMP0167 NEW)
20+
find_package(Python COMPONENTS Development)
21+
22+
- message("Looking for libboost_python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}")
23+
- find_package(Boost QUIET COMPONENTS python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR})
24+
+ message("Looking for libboost_python${Python_VERSION_MAJOR}${Python_VERSION_MINOR}")
25+
+ find_package(Boost QUIET COMPONENTS python${Python_VERSION_MAJOR}${Python_VERSION_MINOR})
26+
# libboost_python3 style libraries
27+
if (NOT Boost_FOUND)
28+
- message("Looking for libboost_python${PYTHON_VERSION_MAJOR}")
29+
- find_package(Boost QUIET COMPONENTS python${PYTHON_VERSION_MAJOR})
30+
+ message("Looking for libboost_python${Python_VERSION_MAJOR}")
31+
+ find_package(Boost QUIET COMPONENTS python${Python_VERSION_MAJOR})
32+
endif()
33+
34+
- # libboost_python style libraries
35+
- if (NOT Boost_FOUND)
36+
- message("Looking for libboost_python")
37+
- find_package(Boost QUIET COMPONENTS system thread python)
38+
- endif()
39+
-
40+
# libboost_python-py36 style libraries
41+
if (NOT Boost_FOUND)
42+
- message("Looking for libboost_python-py${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}")
43+
- find_package(Boost QUIET COMPONENTS python-py${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR})
44+
+ message("Looking for libboost_python-py${Python_VERSION_MAJOR}${Python_VERSION_MINOR}")
45+
+ find_package(Boost QUIET COMPONENTS python-py${Python_VERSION_MAJOR}${Python_VERSION_MINOR})
46+
endif()
47+
48+
# libboost_python3-py36 style libraries
49+
if (NOT Boost_FOUND)
50+
- message("Looking for libboost_python3-py${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}")
51+
- find_package(Boost QUIET COMPONENTS python3-py${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR})
52+
+ message("Looking for libboost_python3-py${Python_VERSION_MAJOR}${Python_VERSION_MINOR}")
53+
+ find_package(Boost QUIET COMPONENTS python3-py${Python_VERSION_MAJOR}${Python_VERSION_MINOR})
54+
endif()
55+
56+
# Nothing worked
57+
if (NOT Boost_FOUND)
58+
diff --git a/Hcal/src/Hcal/HcalClusterProducer.cxx b/Hcal/src/Hcal/HcalClusterProducer.cxx
59+
--- a/Hcal/src/Hcal/HcalClusterProducer.cxx
60+
+++ b/Hcal/src/Hcal/HcalClusterProducer.cxx
61+
@@ -2,6 +2,7 @@
62+
63+
#include <exception>
64+
#include <iostream>
65+
+#include <list>
66+
67+
#include "Hcal/MyClusterWeight.h"
68+
#include "Hcal/TemplatedClusterFinder.h"

‎ci/interop/v4.1.4.patch‎

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,3 +21,59 @@ index 140011d9..0e07b681 100644
2121
#include <iostream>
2222

2323
#include "TrigScint/Firmware/clusterproducer.h"
24+
diff --git a/DetDescr/CMakeLists.txt b/DetDescr/CMakeLists.txt
25+
--- a/DetDescr/CMakeLists.txt
26+
+++ b/DetDescr/CMakeLists.txt
27+
@@ -17,32 +17,27 @@
28+
option(BUILD_DETECTORID_BINDINGS "Build the python bindings for the the DetDescr/DetectorID components" ON)
29+
if(BUILD_DETECTORID_BINDINGS)
30+
+ cmake_policy(SET CMP0167 NEW)
31+
find_package(Python COMPONENTS Development)
32+
33+
- message("Looking for libboost_python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}")
34+
- find_package(Boost QUIET COMPONENTS python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR})
35+
+ message("Looking for libboost_python${Python_VERSION_MAJOR}${Python_VERSION_MINOR}")
36+
+ find_package(Boost QUIET COMPONENTS python${Python_VERSION_MAJOR}${Python_VERSION_MINOR})
37+
# libboost_python3 style libraries
38+
if (NOT Boost_FOUND)
39+
- message("Looking for libboost_python${PYTHON_VERSION_MAJOR}")
40+
- find_package(Boost QUIET COMPONENTS python${PYTHON_VERSION_MAJOR})
41+
+ message("Looking for libboost_python${Python_VERSION_MAJOR}")
42+
+ find_package(Boost QUIET COMPONENTS python${Python_VERSION_MAJOR})
43+
endif()
44+
45+
- # libboost_python style libraries
46+
- if (NOT Boost_FOUND)
47+
- message("Looking for libboost_python")
48+
- find_package(Boost QUIET COMPONENTS system thread python)
49+
- endif()
50+
-
51+
# libboost_python-py36 style libraries
52+
if (NOT Boost_FOUND)
53+
- message("Looking for libboost_python-py${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}")
54+
- find_package(Boost QUIET COMPONENTS python-py${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR})
55+
+ message("Looking for libboost_python-py${Python_VERSION_MAJOR}${Python_VERSION_MINOR}")
56+
+ find_package(Boost QUIET COMPONENTS python-py${Python_VERSION_MAJOR}${Python_VERSION_MINOR})
57+
endif()
58+
59+
# libboost_python3-py36 style libraries
60+
if (NOT Boost_FOUND)
61+
- message("Looking for libboost_python3-py${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}")
62+
- find_package(Boost QUIET COMPONENTS python3-py${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR})
63+
+ message("Looking for libboost_python3-py${Python_VERSION_MAJOR}${Python_VERSION_MINOR}")
64+
+ find_package(Boost QUIET COMPONENTS python3-py${Python_VERSION_MAJOR}${Python_VERSION_MINOR})
65+
endif()
66+
67+
# Nothing worked
68+
if (NOT Boost_FOUND)
69+
diff --git a/Hcal/src/Hcal/HcalClusterProducer.cxx b/Hcal/src/Hcal/HcalClusterProducer.cxx
70+
--- a/Hcal/src/Hcal/HcalClusterProducer.cxx
71+
+++ b/Hcal/src/Hcal/HcalClusterProducer.cxx
72+
@@ -2,6 +2,7 @@
73+
74+
#include <exception>
75+
#include <iostream>
76+
+#include <list>
77+
78+
#include "Hcal/MyClusterWeight.h"
79+
#include "Hcal/TemplatedClusterFinder.h"

‎ci/interop/v4.2.20.patch‎

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
diff --git a/DetDescr/CMakeLists.txt b/DetDescr/CMakeLists.txt
2+
--- a/DetDescr/CMakeLists.txt
3+
+++ b/DetDescr/CMakeLists.txt
4+
@@ -17,32 +17,27 @@
5+
option(BUILD_DETECTORID_BINDINGS "Build the python bindings for the the DetDescr/DetectorID components" ON)
6+
if(BUILD_DETECTORID_BINDINGS)
7+
+ cmake_policy(SET CMP0167 NEW)
8+
find_package(Python COMPONENTS Development)
9+
10+
- message("Looking for libboost_python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}")
11+
- find_package(Boost QUIET COMPONENTS python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR})
12+
+ message("Looking for libboost_python${Python_VERSION_MAJOR}${Python_VERSION_MINOR}")
13+
+ find_package(Boost QUIET COMPONENTS python${Python_VERSION_MAJOR}${Python_VERSION_MINOR})
14+
# libboost_python3 style libraries
15+
if (NOT Boost_FOUND)
16+
- message("Looking for libboost_python${PYTHON_VERSION_MAJOR}")
17+
- find_package(Boost QUIET COMPONENTS python${PYTHON_VERSION_MAJOR})
18+
+ message("Looking for libboost_python${Python_VERSION_MAJOR}")
19+
+ find_package(Boost QUIET COMPONENTS python${Python_VERSION_MAJOR})
20+
endif()
21+
22+
- # libboost_python style libraries
23+
- if (NOT Boost_FOUND)
24+
- message("Looking for libboost_python")
25+
- find_package(Boost QUIET COMPONENTS system thread python)
26+
- endif()
27+
-
28+
# libboost_python-py36 style libraries
29+
if (NOT Boost_FOUND)
30+
- message("Looking for libboost_python-py${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}")
31+
- find_package(Boost QUIET COMPONENTS python-py${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR})
32+
+ message("Looking for libboost_python-py${Python_VERSION_MAJOR}${Python_VERSION_MINOR}")
33+
+ find_package(Boost QUIET COMPONENTS python-py${Python_VERSION_MAJOR}${Python_VERSION_MINOR})
34+
endif()
35+
36+
# libboost_python3-py36 style libraries
37+
if (NOT Boost_FOUND)
38+
- message("Looking for libboost_python3-py${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}")
39+
- find_package(Boost QUIET COMPONENTS python3-py${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR})
40+
+ message("Looking for libboost_python3-py${Python_VERSION_MAJOR}${Python_VERSION_MINOR}")
41+
+ find_package(Boost QUIET COMPONENTS python3-py${Python_VERSION_MAJOR}${Python_VERSION_MINOR})
42+
endif()
43+
44+
# Nothing worked
45+
if (NOT Boost_FOUND)
46+
diff --git a/Hcal/src/Hcal/HcalClusterProducer.cxx b/Hcal/src/Hcal/HcalClusterProducer.cxx
47+
--- a/Hcal/src/Hcal/HcalClusterProducer.cxx
48+
+++ b/Hcal/src/Hcal/HcalClusterProducer.cxx
49+
@@ -2,6 +2,7 @@
50+
51+
#include <exception>
52+
#include <iostream>
53+
+#include <list>
54+
55+
#include "Hcal/MyClusterWeight.h"
56+
#include "Hcal/TemplatedClusterFinder.h"

‎ci/interop/v4.3.3.patch‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
v4.2.20.patch

‎ci/interop/v4.4.14.patch‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
v4.2.20.patch

‎ci/interop/v4.4.7.patch‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
v4.2.20.patch

‎ci/interop/v4.5.11.patch‎

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
diff --git a/CMakeLists.txt b/CMakeLists.txt
2+
--- a/CMakeLists.txt
3+
+++ b/CMakeLists.txt
4+
@@ -55,10 +55,10 @@
5+
6+
find_package(GENIE)
7+
8+
+cmake_policy(SET CMP0167 NEW)
9+
find_package(
10+
Boost REQUIRED
11+
- COMPONENTS system
12+
- log
13+
+ COMPONENTS log
14+
filesystem
15+
thread
16+
chrono
17+
diff --git a/DetDescr/CMakeLists.txt b/DetDescr/CMakeLists.txt
18+
--- a/DetDescr/CMakeLists.txt
19+
+++ b/DetDescr/CMakeLists.txt
20+
@@ -12,32 +12,27 @@
21+
option(BUILD_DETECTORID_BINDINGS "Build the python bindings for the the DetDescr/DetectorID components" ON)
22+
if(BUILD_DETECTORID_BINDINGS)
23+
+ cmake_policy(SET CMP0167 NEW)
24+
find_package(Python COMPONENTS Development)
25+
26+
- message("Looking for libboost_python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}")
27+
- find_package(Boost QUIET COMPONENTS python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR})
28+
+ message("Looking for libboost_python${Python_VERSION_MAJOR}${Python_VERSION_MINOR}")
29+
+ find_package(Boost QUIET COMPONENTS python${Python_VERSION_MAJOR}${Python_VERSION_MINOR})
30+
# libboost_python3 style libraries
31+
if (NOT Boost_FOUND)
32+
- message("Looking for libboost_python${PYTHON_VERSION_MAJOR}")
33+
- find_package(Boost QUIET COMPONENTS python${PYTHON_VERSION_MAJOR})
34+
+ message("Looking for libboost_python${Python_VERSION_MAJOR}")
35+
+ find_package(Boost QUIET COMPONENTS python${Python_VERSION_MAJOR})
36+
endif()
37+
38+
- # libboost_python style libraries
39+
- if (NOT Boost_FOUND)
40+
- message("Looking for libboost_python")
41+
- find_package(Boost QUIET COMPONENTS system thread python)
42+
- endif()
43+
-
44+
# libboost_python-py36 style libraries
45+
if (NOT Boost_FOUND)
46+
- message("Looking for libboost_python-py${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}")
47+
- find_package(Boost QUIET COMPONENTS python-py${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR})
48+
+ message("Looking for libboost_python-py${Python_VERSION_MAJOR}${Python_VERSION_MINOR}")
49+
+ find_package(Boost QUIET COMPONENTS python-py${Python_VERSION_MAJOR}${Python_VERSION_MINOR})
50+
endif()
51+
52+
# libboost_python3-py36 style libraries
53+
if (NOT Boost_FOUND)
54+
- message("Looking for libboost_python3-py${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}")
55+
- find_package(Boost QUIET COMPONENTS python3-py${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR})
56+
+ message("Looking for libboost_python3-py${Python_VERSION_MAJOR}${Python_VERSION_MINOR}")
57+
+ find_package(Boost QUIET COMPONENTS python3-py${Python_VERSION_MAJOR}${Python_VERSION_MINOR})
58+
endif()
59+
60+
# Nothing worked
61+
if (NOT Boost_FOUND)
62+
diff --git a/Hcal/src/Hcal/HcalClusterProducer.cxx b/Hcal/src/Hcal/HcalClusterProducer.cxx
63+
--- a/Hcal/src/Hcal/HcalClusterProducer.cxx
64+
+++ b/Hcal/src/Hcal/HcalClusterProducer.cxx
65+
@@ -2,6 +2,7 @@
66+
67+
#include <exception>
68+
#include <iostream>
69+
+#include <list>
70+
71+
#include "Hcal/MyClusterWeight.h"
72+
#include "Hcal/TemplatedClusterFinder.h"

0 commit comments

Comments
 (0)