b2cd752635
Drop patches accepted upstream root-FitData-assert-fix.patch root-clang-altivec-vector.patch root-format-fix.patch root-moved-file.patch root-xmlmodify-dep.patch New and improved Python bindings The new Python bindings can be built for both Python 2 and Python 3 out of the box. Dropped the workaround in specfile for this (EPEL 7) Dropped the python3-other packages (EPEL 7) The new Python bindings has split the TPython interface to a separate library. Now in a separate root-tpython package root-tpython and root-tmva-python are now using Python 3 on EPEL 7 New subpackage root-gui-browsable New patches (submitted upstream) Fix too aggressive -Werror replacements Add missing call to TFile::SetCacheFileDir in a TMVA tutorial Adjust stressGraphics.ref Fix off-by-one error in histogram v7 bin iterator Compatibility with python 2.7 versions before 2.7.9 Fix the RNTuple.LargeFile test on 32bit (i386 and armv7hf) Fix doxygen issues Fix bad regex in TProofMgr Compatibility with xrootd 5
57 lines
2.3 KiB
Diff
57 lines
2.3 KiB
Diff
From a5185f2cdf509314970c1b332c5926283f6962e2 Mon Sep 17 00:00:00 2001
|
|
From: Mattias Ellert <mattias.ellert@physics.uu.se>
|
|
Date: Mon, 22 Jun 2020 09:21:23 +0200
|
|
Subject: [PATCH] Fix too aggressive -Werror replacements
|
|
|
|
The replacements removes the -Werror option for externals, which is
|
|
intended. However, it also replaces e.g. -Werror=format-security with
|
|
=format-security, which results in compilation failures due to the
|
|
unknown option =format-security.
|
|
---
|
|
builtins/davix/CMakeLists.txt | 2 +-
|
|
cmake/modules/SearchInstalledSoftware.cmake | 2 +-
|
|
interpreter/CMakeLists.txt | 2 +-
|
|
3 files changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/builtins/davix/CMakeLists.txt b/builtins/davix/CMakeLists.txt
|
|
index 52614ae2e0..c9b291ec45 100644
|
|
--- a/builtins/davix/CMakeLists.txt
|
|
+++ b/builtins/davix/CMakeLists.txt
|
|
@@ -21,7 +21,7 @@ foreach(lib davix neon)
|
|
list(APPEND DAVIX_LIBRARIES ${DAVIX_PREFIX}/lib/${libname})
|
|
endforeach()
|
|
|
|
-string(REPLACE "-Werror" "" DAVIX_CXX_FLAGS ${CMAKE_CXX_FLAGS})
|
|
+string(REPLACE "-Werror " "" DAVIX_CXX_FLAGS "${CMAKE_CXX_FLAGS} ")
|
|
|
|
ExternalProject_Add(DAVIX
|
|
URL ${DAVIX_URL}/davix-${DAVIX_VERSION}.tar.gz
|
|
diff --git a/cmake/modules/SearchInstalledSoftware.cmake b/cmake/modules/SearchInstalledSoftware.cmake
|
|
index ad63f08cd0..36aa88d8cf 100644
|
|
--- a/cmake/modules/SearchInstalledSoftware.cmake
|
|
+++ b/cmake/modules/SearchInstalledSoftware.cmake
|
|
@@ -9,7 +9,7 @@ include(ExternalProject)
|
|
include(FindPackageHandleStandardArgs)
|
|
|
|
set(lcgpackages http://lcgpackages.web.cern.ch/lcgpackages/tarFiles/sources)
|
|
-string(REPLACE "-Werror" "" ROOT_EXTERNAL_CXX_FLAGS ${CMAKE_CXX_FLAGS})
|
|
+string(REPLACE "-Werror " "" ROOT_EXTERNAL_CXX_FLAGS "${CMAKE_CXX_FLAGS} ")
|
|
|
|
macro(find_package)
|
|
if(NOT "${ARGV0}" IN_LIST ROOT_BUILTINS)
|
|
diff --git a/interpreter/CMakeLists.txt b/interpreter/CMakeLists.txt
|
|
index 0f43893443..1274758410 100644
|
|
--- a/interpreter/CMakeLists.txt
|
|
+++ b/interpreter/CMakeLists.txt
|
|
@@ -140,7 +140,7 @@ if(gcctoolchain)
|
|
endif()
|
|
|
|
# We will not fix llvm or clang.
|
|
-string(REPLACE "-Werror" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
|
|
+string(REPLACE "-Werror " "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ")
|
|
|
|
if(LLVM_SHARED_LINKER_FLAGS)
|
|
set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${LLVM_SHARED_LINKER_FLAGS}")
|
|
--
|
|
2.26.2
|
|
|