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 4.2.3. #2168

Merged
1 commit merged into from Mar 7, 2016
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
2 changes: 1 addition & 1 deletion xrootd-toolfile.spec
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/xrootd.xml
<environment name="XROOTD_BASE" default="@TOOL_ROOT@"/>
<environment name="INCLUDE" default="$XROOTD_BASE/include/xrootd"/>
<environment name="INCLUDE" default="$XROOTD_BASE/include/xrootd/private"/>
<environment name="LIBDIR" default="$XROOTD_BASE/lib"/>
<environment name="LIBDIR" default="$XROOTD_BASE/lib64"/>
</client>
<runtime name="PATH" value="$XROOTD_BASE/bin" type="path"/>
<runtime name="ROOT_INCLUDE_PATH" value="$INCLUDE" type="path"/>
Expand Down
8 changes: 4 additions & 4 deletions xrootd.spec
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
### RPM external xrootd 4.0.4
### RPM external xrootd 4.2.3
## INITENV +PATH LD_LIBRARY_PATH %i/lib64
%define online %(case %cmsplatf in (*onl_*_*) echo true;; (*) echo false;; esac)
%define tag fd6a46e92040ebb2c6897f60bc74c6490212c95a
%define branch cms/v4.0.4
%define tag c6e2eea2d9a04c1d4d4f2518ad027ae6b44fe7dc
%define branch cms/v4.2.3
%define github_user cms-externals
Source: git+https://github.com/%github_user/xrootd.git?obj=%{branch}/%{tag}&export=%{n}-%{realversion}&output=/%{n}-%{realversion}.tgz

Expand Down Expand Up @@ -36,7 +36,7 @@ cmake ../ \
-DCMAKE_INSTALL_PREFIX=%{i} \
-DOPENSSL_ROOT_DIR:PATH=${OPENSSL_ROOT} \
-DZLIB_ROOT:PATH=${ZLIB_ROOT} \
-DENABLE_PERL=FALSE \
-DENABLE_PYTHON=FALSE \
-DENABLE_FUSE=FALSE \
-DENABLE_KRB5=TRUE \
-DENABLE_READLINE=FALSE \
Expand Down