Skip to content
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.

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

Update xrootd to version 5.7.0 #9318

Merged
merged 10 commits into from
Jul 27, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
21 changes: 21 additions & 0 deletions isal.spec
Original file line number Diff line number Diff line change
@@ -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
10 changes: 10 additions & 0 deletions scram-tools.file/tools/isal/isal.xml
Original file line number Diff line number Diff line change
@@ -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>
11 changes: 8 additions & 3 deletions xrootd.spec
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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

Expand Down