Skip to content

Update xrootd to version 5.5.4 #8490

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

Merged
smuzaffar merged 1 commit into from
May 4, 2023
Merged

Update xrootd to version 5.5.4 #8490

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 0 additions & 1 deletion scram-tools.file/tools/xrootd/xrootd.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,4 @@
<runtime name="PATH" value="$XROOTD_BASE/bin" type="path"/>
<runtime name="ROOT_INCLUDE_PATH" value="$INCLUDE" type="path"/>
<use name="root_cxxdefaults"/>
<use name="scitokens-cpp"/>
</tool>
6 changes: 2 additions & 4 deletions xrootd.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
### RPM external xrootd 5.5.3
### RPM external xrootd 5.5.4
## INITENV +PATH LD_LIBRARY_PATH %i/lib64
## INITENV +PATH PYTHON3PATH %{i}/${PYTHON3_LIB_SITE_PACKAGES}

Expand All @@ -12,7 +12,6 @@ BuildRequires: cmake gmake autotools
Requires: zlib libuuid curl davix
Requires: python3 py3-setuptools
Requires: libxml2
Requires: scitokens-cpp

%define soext so
%ifarch darwin
Expand Down Expand Up @@ -46,8 +45,7 @@ cmake ../%n-%{realversion} \
-DCMAKE_CXX_FLAGS="-I${LIBUUID_ROOT}/include -I${DAVIX_ROOT}/include" \
-DUUID_INCLUDE_DIR="${LIBUUID_ROOT}/include" \
-DUUID_LIBRARY="${LIBUUID_ROOT}/lib64/libuuid.%{soext}" \
-DSCITOKENS_CPP_DIR="${SCITOKENS_CPP_ROOT}" \
-DCMAKE_PREFIX_PATH="${ZLIB_ROOT};${PYTHON3_ROOT};${LIBXML2_ROOT};${LIBUUID_ROOT};${SCITOKENS_CPP_ROOT};${CURL_ROOT};${DAVIX_ROOT}"
-DCMAKE_PREFIX_PATH="${ZLIB_ROOT};${PYTHON3_ROOT};${LIBXML2_ROOT};${LIBUUID_ROOT};${CURL_ROOT};${DAVIX_ROOT}"

make %makeprocesses VERBOSE=1

Expand Down