Merge pull request #9318 from cms-sw/xrootd-5.7.0

Update xrootd to version 5.7.0

isal.spec

@@ -0,0 +1,21 @@
+### RPM external isal 2.30.0
+
+%define strip_files %i/lib
+%define tag %{realversion}
+%define branch master
+%define github_user xrootd
+Source: https://github.com/intel/isa-l/archive/refs/tags/v%{realversion}.tar.gz
+
+BuildRequires: nasm
+
+%prep
+%setup -n isa-l-%{realversion}
+
+%build
+./autogen.sh
+./configure --prefix=%{i} --with-pic
+
+make %{makeprocesses}
+
+%install
+make install

scram-tools.file/tools/isal/isal.xml

@@ -0,0 +1,10 @@
+<tool name="isal" version="@TOOL_VERSION@">
+  <info url="https://github.com/intel/isa-l/wiki"/>
+  <lib name="isal"/>
+  <client>
+    <environment name="ISAL_BASE" default="@TOOL_ROOT@"/>
+    <environment name="LIBDIR" default="$ISAL_BASE/lib"/>
+    <environment name="INCLUDE" default="$ISAL_BASE/include"/>
+  </client>
+  <use name="eigen"/>
+</tool>

xrootd.spec

@@ -1,18 +1,22 @@
-### RPM external xrootd 5.6.4
+### RPM external xrootd 5.7.0
 ## INITENV +PATH LD_LIBRARY_PATH %i/lib64
 ## INITENV +PATH PYTHON3PATH %{i}/${PYTHON3_LIB_SITE_PACKAGES}
 
 %define strip_files %i/lib
 %define tag %{realversion}
 %define branch master
 %define github_user xrootd
-Source: https://xrootd.slac.stanford.edu/download/v%{realversion}/%{n}-%{realversion}.tar.gz
+Source: https://github.com/xrootd/xrootd/releases/download/v%{realversion}/%{n}-%{realversion}.tar.gz
 
 BuildRequires: cmake gmake autotools py3-pip
 Requires: zlib libuuid curl davix
 Requires: python3 py3-setuptools
 Requires: libxml2
 
+%ifarch x86_64
+Requires: isal
+%endif
+
 %define soext so
 %ifarch darwin
 %define soext dylib
@@ -39,11 +43,12 @@ cmake ../%n-%{realversion} \
   -DCMAKE_SKIP_RPATH=TRUE \
   -DENABLE_PYTHON=TRUE \
   -DENABLE_HTTP=TRUE \
+  -DENABLE_XRDEC=TRUE \
   -DXRD_PYTHON_REQ_VERSION=3 \
   -DPIP_OPTIONS="--verbose" \
   -DCMAKE_CXX_FLAGS="-I${LIBUUID_ROOT}/include" \
   -DCMAKE_SHARED_LINKER_FLAGS="-L${LIBUUID_ROOT}/lib64" \
-  -DCMAKE_PREFIX_PATH="${ZLIB_ROOT};${PYTHON3_ROOT};${LIBXML2_ROOT};${LIBUUID_ROOT};${CURL_ROOT};${DAVIX_ROOT}"
+  -DCMAKE_PREFIX_PATH="%{cmake_prefix_path}"
 
 make %makeprocesses VERBOSE=1