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.

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

Rivet 3.1.7 & YODA 1.9.7 #8109

Merged
merged 4 commits into from
Oct 27, 2022
Merged

Rivet 3.1.7 & YODA 1.9.7 #8109

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
70ef2e5
Rivet 3.1.7 & YODA 1.9.7
mseidel42 Sep 29, 2022
f28b664
cleanup : yoda latest version already has fix this patching
smuzaffar Sep 29, 2022
af72550
build sherpa with c++17 ( same as rivet)
smuzaffar Oct 9, 2022
0b6554a
Delete relocateConfig SOURCES.txt
mseidel42 Oct 26, 2022
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
3 changes: 1 addition & 2 deletions rivet.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
### RPM external rivet 3.1.6
### RPM external rivet 3.1.7
## INITENV +PATH PYTHON3PATH %{i}/${PYTHON3_LIB_SITE_PACKAGES}
## OLD GENSER Source: http://cern.ch/service-spi/external/MCGenerators/distribution/rivet/rivet-%{realversion}-src.tgz
Source: git+https://gitlab.com/hepcedar/rivet.git?obj=master/%{n}-%{realversion}&export=%{n}-%{realversion}&output=/%{n}-%{realversion}.tgz
Expand Down Expand Up @@ -59,4 +59,3 @@ sed -i -e 's|^#!.*python.*|#!/usr/bin/env python3|' %{i}/bin/*
%{relocateConfig}bin/rivet-config
%{relocateConfig}bin/rivet-buildplugin
%{relocateConfig}bin/rivet-build
%{relocateConfig}lib/python*/site-packages/rivet-*egg-info/SOURCES.txt
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 @@ -47,7 +47,7 @@ export PYTHON=$(which python3)
CXX="mpicxx" \
MPICXX="mpicxx" \
FC="mpifort" \
CXXFLAGS="-fuse-cxa-atexit $ARCH_CMSPLATF -O2 -std=c++0x -I$LHAPDF_ROOT/include -I$BLACKHAT_ROOT/include -I$RIVET_ROOT/include" \
CXXFLAGS="-fuse-cxa-atexit $ARCH_CMSPLATF -O2 -std=c++17 -I$LHAPDF_ROOT/include -I$BLACKHAT_ROOT/include -I$RIVET_ROOT/include" \
LDFLAGS="-ldl -L$BLACKHAT_ROOT/lib/blackhat -L$QD_ROOT/lib"

make %{makeprocesses}
Expand Down
6 changes: 1 addition & 5 deletions yoda.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
### RPM external yoda 1.9.6
### RPM external yoda 1.9.7
## INITENV +PATH PYTHON3PATH %i/${PYTHON3_LIB_SITE_PACKAGES}

Source: git+https://gitlab.com/hepcedar/yoda.git?obj=main/%{n}-%{realversion}&export=%{n}-%{realversion}&output=/%{n}-%{realversion}.tgz
Expand All @@ -13,9 +13,6 @@ autoreconf -fiv

%build

sed -i -e "s|lPyROOT|lcppyyX.X|" ./pyext/setup.py.in

sed -i -e "s|lcppyy...|lcppyy$(echo %{cms_python3_major_minor_version} | tr . _)|" ./pyext/setup.py.in
PYTHON=$(which python3) ./configure --prefix=%i --enable-root
sed -i "s|env python|env python3|" bin/*
make %{makeprocesses} all
Expand All @@ -25,4 +22,3 @@ make install

%post
%{relocateConfig}bin/yoda-config
%{relocateConfig}lib/python*/site-packages/yoda*egg-info/SOURCES.txt