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

Jump to bottom

changes sherpa spec files for pyext , scons and swig to work #2356

Merged
merged 6 commits into from Jun 28, 2016
Merged

changes sherpa spec files for pyext , scons and swig to work #2356

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
324ab7d
changes sherpa spec files for pyext , scons and swig to work
iahmad-khan Jun 27, 2016
d40d324
adds swig as buildrequire
iahmad-khan Jun 27, 2016
1be0b1c
scons toolfile added
iahmad-khan Jun 28, 2016
e7f757e
Update scons-toolfile.spec
iahmad-khan Jun 28, 2016
fbb5240
scon lib dir fixed
iahmad-khan Jun 28, 2016
6cf3e2d
scon lib dir fixed
iahmad-khan Jun 28, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions sherpa-toolfile.spec
View file
Open in desktop
Expand Up @@ -30,6 +30,8 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/sherpa.xml
<use name="fastjet"/>
<use name="sqlite"/>
<use name="openloops"/>
<use name="scons"/>
<use name="swig"/>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Verify that SWIG is needed at run-time (e.g. something links to SWIG libraries)

</tool>
EOF_TOOLFILE

Expand Down
14 changes: 13 additions & 1 deletion sherpa.spec
View file
Open in desktop
Expand Up @@ -3,7 +3,7 @@
%define branch cms/v%realversion
%define github_user cms-externals
Source: git+https://github.com/%github_user/%{n}.git?obj=%{branch}/%{tag}&export=%{n}-%{realversion}&output=/%{n}-%{realversion}-%{tag}.tgz
Requires: hepmc lhapdf blackhat sqlite fastjet openssl
Requires: hepmc lhapdf blackhat sqlite fastjet openssl scons swig
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we actually need SWIG as run-time dependency or SWIG is only build-time dependency?

BuildRequires: mcfm

%if "%(case %cmsplatf in (slc*) echo true ;; (*) echo false ;; esac)" == "true"
Expand Down Expand Up @@ -43,6 +43,7 @@ esac
--enable-hepmc2=$HEPMC_ROOT \
--enable-lhapdf=$LHAPDF_ROOT \
--enable-blackhat=$BLACKHAT_ROOT \
--enable-pyext \
${OPENLOOPS_ROOT+--enable-openloops=$OPENLOOPS_ROOT}\
--with-sqlite3=$SQLITE_ROOT \
CXX="%cms_cxx" \
Expand All @@ -53,3 +54,14 @@ make %{makeprocesses}

%install
make install
find %{i}/lib -name '*.la' -delete

%post
%{relocateConfig}lib/python2.7/site-packages/ufo_interface/sconstruct_template
%{relocateConfig}bin/make2scons
%{relocateConfig}share/SHERPA-MC/makelibs
%{relocateConfig}bin/Sherpa-config
%{relocateConfig}bin/Sherpa-generate-model
%{relocateConfig}include/SHERPA-MC/ATOOLS/Org/CXXFLAGS.H


Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove empty lines.