diff --git a/root-linux-vdso.patch b/root-linux-vdso.patch new file mode 100644 index 0000000..f749e9e --- /dev/null +++ b/root-linux-vdso.patch @@ -0,0 +1,47 @@ +From f7161d2612c035604146298809e628d806dbed3a Mon Sep 17 00:00:00 2001 +From: Mattias Ellert +Date: Sun, 29 Nov 2020 07:58:30 +0100 +Subject: [PATCH] Several new test failures on ppc64le with 6.22.06 due to: + g++: error: linux-vdso64.so.1: No such file or directory +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +The list of names filtered out by TCling is incomplete. +The vdso(7) man page gives the following list: + + user ABI vDSO name + ───────────────────────────── + aarch64 linux-vdso.so.1 + arm linux-vdso.so.1 + ia64 linux-gate.so.1 + mips linux-vdso.so.1 + ppc/32 linux-vdso32.so.1 + ppc/64 linux-vdso64.so.1 + riscv linux-vdso.so.1 + s390 linux-vdso32.so.1 + s390x linux-vdso64.so.1 + sh linux-gate.so.1 + i386 linux-gate.so.1 + x86-64 linux-vdso.so.1 + x86/x32 linux-vdso.so.1 +--- + core/metacling/src/TCling.cxx | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/core/metacling/src/TCling.cxx b/core/metacling/src/TCling.cxx +index 5078d7b93e..0e605a5388 100644 +--- a/core/metacling/src/TCling.cxx ++++ b/core/metacling/src/TCling.cxx +@@ -3274,6 +3274,8 @@ static int callback_for_dl_iterate_phdr(struct dl_phdr_info *info, size_t size, + // Skip \0, "", and kernel pseudo-libs linux-vdso.so.1 or linux-gate.so.1 + if (info->dlpi_name && info->dlpi_name[0] + && strncmp(info->dlpi_name, "linux-vdso.so", 13) ++ && strncmp(info->dlpi_name, "linux-vdso32.so", 15) ++ && strncmp(info->dlpi_name, "linux-vdso64.so", 15) + && strncmp(info->dlpi_name, "linux-gate.so", 13)) + newLibs->emplace_back(info->dlpi_name); + sKnownLoadedLibBaseAddrs.insert(info->dlpi_addr); +-- +2.28.0 + diff --git a/root.spec b/root.spec index 5fe71bc..b1c0956 100644 --- a/root.spec +++ b/root.spec @@ -43,9 +43,9 @@ %global __provides_exclude_from ^(%{?python2_sitearch:%{python2_sitearch}|}%{python3_sitearch})/lib.*\\.so$ Name: root -Version: 6.22.04 +Version: 6.22.06 %global libversion %(cut -d. -f 1-2 <<< %{version}) -Release: 2%{?dist} +Release: 1%{?dist} Summary: Numerical data analysis framework License: LGPLv2+ @@ -158,6 +158,9 @@ Patch35: %{name}-fix-a-shadow-warning.patch # Do not attempt to load_library the ROOT Pythonizations module # https://github.com/root-project/root/pull/6883 Patch36: %{name}-do-not-load_library-libROOTPythonizations.patch +# Filter out additional vDSO names for ppc +# https://github.com/root-project/root/pull/6887 +Patch37: %{name}-linux-vdso.patch # s390x suffers from endian issues resulting in failing tests # and broken documentation generation @@ -1877,6 +1880,7 @@ This package contains an ntuple extension for ROOT 7. %patch34 -p1 %patch35 -p1 %patch36 -p1 +%patch37 -p1 # Remove bundled sources in order to be sure they are not used # * afterimage @@ -2446,9 +2450,6 @@ popd # reads input data over network # http://root.cern.ch/files/NanoAOD_DoubleMuon_CMS2011OpenData.root (1.5 GB) # -# - tutorial-pythia-pythia8 -# sometimes times out -# # - tutorial-v7-line.cxx # requires a web browser (and js-jsroot) to render javascript graphics # @@ -2488,7 +2489,6 @@ tutorial-dataframe-df102_NanoAODDimuonAnalysis|\ tutorial-dataframe-df103_NanoAODHiggsAnalysis|\ tutorial-v7-ntuple-ntpl003_lhcbOpenData|\ tutorial-v7-ntuple-ntpl004_dimuon|\ -tutorial-pythia-pythia8|\ tutorial-v7-line.cxx|\ gtest-io-io-test-RRawFile|\ gtest-net-davix-test-RRawFileDavix|\ @@ -3500,6 +3500,10 @@ fi %endif %changelog +* Sat Nov 28 2020 Mattias Ellert - 6.22.06-1 +- Update to 6.22.06 +- Filter out additional vDSO names for ppc + * Thu Nov 26 2020 Mattias Ellert - 6.22.04-2 - Do not attempt to load_library the ROOT Pythonizations module diff --git a/sources b/sources index 9b2d4be..7a1576a 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (root-6.22.04.tar.xz) = 5ce502626c958b1bb4faba1bfb128f3c9162d132a39763765a678dfb8f60e9c9dcd25011dbf5fbc4791223872ce4d1c5582be4bc0d0c7d64729b54f38b35fdb9 +SHA512 (root-6.22.06.tar.xz) = 92d7cf67767639035a7b7c8a22e16a75ac9fea0523592635f245c2768da093651b7dcfd46a3e7b6a8f73a2a0262fc1b63d9f19b28b73b659ee1da33e876f3cee SHA512 (root-testfiles.tar.xz) = 945aef1a0cf5af672d4ab84b0ac00b76118e93008ff72447658ee82d9e955a1540af3ff7126e701418872f1d91b92ee96d4985840a519036c42732023a13f00f