Skip to content

[XRootd] Update to version 5.1.1 #6831

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
mrodozov wants to merge 3 commits into from
Closed

[XRootd] Update to version 5.1.1 #6831

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b6f834b
[XRootd] Update to version 5.1.1 - build in debug
Apr 21, 2021
a711408
debug also for ROOT :/ it fails in ROOT
Apr 26, 2021
61c5434
Update root.spec
May 18, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion root.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ export CXXFLAGS=-D__ROOFIT_NOBANNER

cmake ../%{n}-%{realversion} \
-G Ninja \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_BUILD_TYPE=Debug \
-DLLVM_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX="%{i}" \
-DCMAKE_C_COMPILER=gcc \
Expand Down
2 changes: 1 addition & 1 deletion xrootd-toolfile.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ mkdir -p %i/etc/scram.d
cat << \EOF_TOOLFILE >%i/etc/scram.d/xrootd.xml
<tool name="xrootd" version="@TOOL_VERSION@">
<lib name="XrdUtils"/>
<lib name="XrdClient"/>
<lib name="XrdCl"/>
<client>
<environment name="XROOTD_BASE" default="@TOOL_ROOT@"/>
<environment name="INCLUDE" default="$XROOTD_BASE/include/xrootd"/>
Expand Down
8 changes: 4 additions & 4 deletions xrootd.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
### RPM external xrootd 4.12.3
### RPM external xrootd 5.1.1
## INITENV +PATH LD_LIBRARY_PATH %i/lib64
## INITENV +PATH PYTHON27PATH %{i}/${PYTHON_LIB_SITE_PACKAGES}
## INITENV +PATH PYTHON3PATH %{i}/${PYTHON3_LIB_SITE_PACKAGES}

%define tag b122d662f80a46a570876afd32cdaa9f4370dc1d
%define branch stable-4.12.x
%define tag v%{realversion}
%define branch stable-5.1.x
%define github_user xrootd
Source: git+https://github.com/%github_user/xrootd.git?obj=%{branch}/%{tag}&export=%{n}-%{realversion}&output=/%{n}-%{realversion}.tgz

Expand All @@ -30,7 +30,7 @@ perl -p -i -e 's|^#!.*perl(.*)|#!/usr/bin/env perl$1|' src/XrdMon/xrdmonPrepareS
# libfuse and libperl are not produced by CMSDIST.

CMAKE_ARGS="-DCMAKE_INSTALL_PREFIX=%{i} \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_BUILD_TYPE=Debug \
-DOPENSSL_ROOT_DIR:PATH=${OPENSSL_ROOT} \
-DZLIB_ROOT:PATH=${ZLIB_ROOT} \
-DENABLE_PYTHON=FALSE \
Expand Down