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

Avoid unneeded build requirement on srm-ifce-devel

Browse source 
Do not export Python modules in CMake config
Drop patch root-clang-ignore-gcc-options.patch
  ("Recent ROOT does not send all possible compiler flags to rootcling.")
This commit is contained in:
Mattias Ellert 2020-08-21 01:41:39 +02:00
commit 82f0a3aaee
8 changed files with 156 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

25
root-no-export-python-modules.patch Normal file
View file

@ -0,0 +1,25 @@
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 @@
endforeach()
# 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)
endforeach()