rpms/root
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update to 6.22.02

Browse source 
Drop patch previously backported: root-doxygen-endof-part1.patch
Drop patch accepted upstream: root-python2-compat.patch
Add back line accidentally removed in root-config
Install headers in new PyROOT with COMPONENT headers
Increase test timeout for ppc64le
This commit is contained in:
Mattias Ellert 2020-08-23 16:27:44 +02:00
commit 1361b0d800
10 changed files with 191 additions and 166 deletions
Download patch file Download diff file Expand all files Collapse all files

39
root-no-export-python-modules.patch
View file

@ -1,19 +1,7 @@
diff -ur root-6.22.00.orig/bindings/jupyroot/CMakeLists.txt root-6.22.00/bindings/jupyroot/CMakeLists.txt
--- root-6.22.00.orig/bindings/jupyroot/CMakeLists.txt 2020-06-14 17:51:48.000000000 +0200
+++ root-6.22.00/bindings/jupyroot/CMakeLists.txt 2020-08-20 13:56:08.875471462 +0200
@@ -58,7 +58,7 @@
endforeach()
# Install library
- install(TARGETS ${libname} EXPORT ${CMAKE_PROJECT_NAME}Exports DESTINATION ${runtimedir})
+ install(TARGETS ${libname} DESTINATION ${runtimedir})
endforeach()
diff -ur root-6.22.00.orig/bindings/pyroot/pythonizations/CMakeLists.txt root-6.22.00/bindings/pyroot/pythonizations/CMakeLists.txt
--- root-6.22.00.orig/bindings/pyroot/pythonizations/CMakeLists.txt 2020-06-14 17:51:48.000000000 +0200
+++ root-6.22.00/bindings/pyroot/pythonizations/CMakeLists.txt 2020-08-20 13:57:31.465673116 +0200
@@ -124,8 +124,7 @@
diff -ur root-6.22.02.orig/bindings/jupyroot/CMakeLists.txt root-6.22.02/bindings/jupyroot/CMakeLists.txt
--- root-6.22.02.orig/bindings/jupyroot/CMakeLists.txt 2020-08-17 14:41:56.000000000 +0200
+++ root-6.22.02/bindings/jupyroot/CMakeLists.txt 2020-08-19 09:49:12.094722642 +0200
@@ -70,8 +70,7 @@
endforeach()
# Install library
@ -22,4 +10,21 @@ diff -ur root-6.22.00.orig/bindings/pyroot/pythonizations/CMakeLists.txt root-6.
+ install(TARGETS ${libname} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT libraries
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT libraries
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT libraries)
endforeach()
diff -ur root-6.22.02.orig/bindings/pyroot/pythonizations/CMakeLists.txt root-6.22.02/bindings/pyroot/pythonizations/CMakeLists.txt
--- root-6.22.02.orig/bindings/pyroot/pythonizations/CMakeLists.txt 2020-08-17 14:41:56.000000000 +0200
+++ root-6.22.02/bindings/pyroot/pythonizations/CMakeLists.txt 2020-08-19 10:36:10.390486171 +0200
@@ -133,11 +133,10 @@
# Create meta-target PyROOT2 and PyROOT3 (INTERFACE library)
# Export of targets are not supported for custom targets(add_custom_targets())
add_library(PyROOT${python_major_version_string} INTERFACE)
- target_link_libraries(PyROOT${python_major_version_string} INTERFACE cppyy_backend${python_under_version_string} cppyy${python_under_version_string} ROOTPythonizations${python_under_version_string})
+ target_link_libraries(PyROOT${python_major_version_string} INTERFACE cppyy_backend${python_under_version_string} cppyy${python_under_version_string})
# Install library
- install(TARGETS ${libname} EXPORT ${CMAKE_PROJECT_NAME}Exports
- RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT libraries
+ install(TARGETS ${libname} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT libraries
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT libraries
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT libraries)