Skip to content

draft hepmc with cmake; cleanup old patches #6725

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.

Sign up for GitHub

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

Merged
smuzaffar merged 6 commits into from
Mar 16, 2021
Merged

draft hepmc with cmake; cleanup old patches #6725

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8a97caa
draft hepmc with cmake; cleanup old patches
davidlange6 Mar 12, 2021
9b906ba
add autotools to rivet buildrequires
davidlange6 Mar 12, 2021
9f6d685
needs autotools
davidlange6 Mar 12, 2021
867b9aa
remove shared libs (to keep status quo)
davidlange6 Mar 15, 2021
1fee9d0
Update hepmc.spec
smuzaffar Mar 16, 2021
74c6ca7
Update hepmc.spec
smuzaffar Mar 16, 2021
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
13 changes: 0 additions & 13 deletions HepMC-2.06.07-nodoc.patch
View file
Open in desktop

This file was deleted.

11 changes: 0 additions & 11 deletions HepMC-2.06.07-pyinit.patch
View file
Open in desktop

This file was deleted.

18 changes: 0 additions & 18 deletions hepmc-2.03.06-reflex.patch
View file
Open in desktop

This file was deleted.

13 changes: 0 additions & 13 deletions hepmc-2.06.07-WeightContainer-fix-size_type.patch
View file
Open in desktop

This file was deleted.

25 changes: 14 additions & 11 deletions hepmc.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,31 +1,34 @@
### RPM external hepmc 2.06.10

%define tag d262dcafa9855927846f7b140a4bc3b31667ef03
%define tag 91c4c217572ac25669e9ad8fdc0111d1d5c82289
%define branch cms/%{realversion}
Source: git+https://github.com/cms-externals/hepmc.git?obj=%{branch}/%{tag}&export=HepMC-%{realversion}&output=/HepMC-%{realversion}.tgz

Requires: autotools
BuildRequires: cmake

%define keep_archives true
%define drop_files %i/share

%prep
%setup -q -n HepMC-%{realversion}

F77="$(which gfortran) -fPIC"
CXX="$(which g++) -fPIC"
PLATF_CONFIG_OPTS="--enable-static --disable-shared"

perl -p -i -e 's|glibtoolize|libtoolize|g' ./bootstrap
%build

export HEPMC_NODOC=1
rm -rf ../build
mkdir ../build
cd ../build

./bootstrap
./configure $PLATF_CONFIG_OPTS --prefix=%{i} --with-momentum=GEV --with-length=MM F77="$F77" CXX="$CXX"
cmake ../HepMC-%{realversion} \
-DCMAKE_INSTALL_PREFIX=%{i} \
-DCMAKE_CXX_FLAGS="-fPIC" \
-DCMAKE_BUILD_TYPE="Release" \
-Dmomentum:STRING=GEV \
-Dlength:STRING=MM

%build
make %makeprocesses

%install
cd ../build
make install
rm -rf %i/lib/*.so
rm -rf %i/lib/*.la
2 changes: 1 addition & 1 deletion rivet.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
Source: git+https://gitlab.com/hepcedar/rivet.git?obj=master/%{n}-%{realversion}&export=%{n}-%{realversion}&output=/%{n}-%{realversion}.tgz

Requires: hepmc fastjet fastjet-contrib yoda
BuildRequires: python py2-cython py2-setuptools
BuildRequires: python py2-cython py2-setuptools autotools

Patch0: rivet-140-313

Expand Down
2 changes: 1 addition & 1 deletion sherpa.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
%define github_user cms-externals
Source: http://www.hepforge.org/archive/sherpa/SHERPA-MC-%{realversion}.tar.gz
Requires: hepmc lhapdf blackhat sqlite fastjet openssl scons python openmpi rivet
BuildRequires: mcfm swig
BuildRequires: mcfm swig autotools
Patch0: sherpa-2.2.10-hepmcshort

%ifos linux
Expand Down