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

[ROOT master] Get latest commits #5813

Merged
merged 4 commits into from
May 17, 2020
Merged
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
10 changes: 7 additions & 3 deletions root.spec
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
## INITENV +PATH PYTHON3PATH %{i}/lib
## INITENV SET ROOTSYS %{i}

%define tag 384e06fed3d7305d8d438c34399d6e6e327256de
%define branch cms/master/73ae672
%define tag 25351d7377004cf2773b40f13028f80af8801ab9
%define branch cms/master/cebff1e
%define github_user cms-sw
Source: git+https://github.com/%{github_user}/root.git?obj=%{branch}/%{tag}&export=%{n}-%{realversion}&output=/%{n}-%{realversion}-%{tag}.tgz

Expand Down Expand Up @@ -173,8 +173,12 @@ export ROOTSYS="%{i}"
ninja -v %{makeprocesses} -l $(getconf _NPROCESSORS_ONLN) install

find %{i} -type f -name '*.py' | xargs chmod -x
grep -R -l '#!.*python' %{i} | xargs chmod +x
grep -rlI '#!.*python' %{i} | xargs chmod +x
perl -p -i -e "s|#!/bin/perl|#!/usr/bin/env perl|" %{i}/bin/memprobe
for p in $(grep -rlI -m1 '^#\!.*python' %i/bin) ; do
lnum=$(grep -n -m1 '^#\!.*python' $p | sed 's|:.*||')
sed -i -e "${lnum}c#!/usr/bin/env python" $p
done

#Make sure root build directory is not available after the root install is done
#This will catch errors if root remembers the build paths.
Expand Down