Skip to content

Commit

Permalink
Keep using the OS-provided tinyxml2 on EL9 and up
Browse files Browse the repository at this point in the history
  • Loading branch information
matyasselmeci committed Jan 4, 2025
1 parent 5c01d29 commit f4111ed
Showing 1 changed file with 7 additions and 0 deletions.
7 changes: 7 additions & 0 deletions rpm/xrdcl-pelican.spec
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,9 @@ BuildRequires: systemd
BuildRequires: openssl-devel
# nlohmann-json-devel is available from the OSG repos
BuildRequires: nlohmann-json-devel
%if 0%{?rhel} >= 9
BuildRequires: tinyxml2-devel >= 9
%endif

Requires: xrootd-client >= 1:%{xrootd_current_major}.%{xrootd_current_minor}
Requires: xrootd-client < 1:%{xrootd_next_major}.0.0-1
Expand All @@ -67,8 +70,12 @@ Requires: xrootd-client < 1:%{xrootd_next_major}.0.0-1
. /opt/rh/gcc-toolset-11/enable
%endif

%if 0%{?rhel} >= 9
%cmake3 -DCMAKE_BUILD_TYPE=RelWithDebInfo -DXROOTD_EXTERNAL_TINYXML2=1 -DXROOTD_EXTERNAL_JSON=1 .
%else
cp %{SOURCE1} cmake/tinyxml2/
%cmake3 -DCMAKE_BUILD_TYPE=RelWithDebInfo -DXROOTD_EXTERNAL_JSON=1 .
%endif
make VERBOSE=1 %{?_smp_mflags}

%install
Expand Down

0 comments on commit f4111ed

Please sign in to comment.