Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Backports from 72X.
- Use own loader to prevent TLS issues.
- Move config to the one which support big plugins. Disable as there are
  no big plugins in 71X.
- Cleanup gcc / llvm toolfiles.
- Advance dcap to latest version.
- Disable a few things (documentation / rpath) in xz. Not really needed
  but since we build root due to dcap in any case.
  • Loading branch information
ktf committed Jul 24, 2014
1 parent 42b0f88 commit f6cf2f4
Show file tree
Hide file tree
Showing 14 changed files with 118 additions and 505 deletions.
4 changes: 2 additions & 2 deletions cmssw-patch.spec
Expand Up @@ -9,12 +9,12 @@ Requires: cmssw-patch-tool-conf
%define baserel_postfix %{nil}
%if "%(case %realversion in (*_ICC_X*) echo true ;; (*) echo false ;; esac)" == "true"
%define branch %(echo %realversion | sed -e 's|_ICC_X.*|_X|')
%define preBuildCommand scram setup icc-cxxcompiler ; scram setup icc-f77compiler ; scram setup icc-ccompiler ; perl -p -i -e 's|<client>|<client><flags DEFAULT_COMPILER="icc"/>|' %i/config/Self.xml
%define preBuildCommand scram setup icc-cxxcompiler ; scram setup icc-f77compiler ; scram setup icc-ccompiler ; perl -p -i -e 's|<client>|<client><flags DEFAULT_COMPILER="icc"/>|' %i/config/Self.xml; export COMPILER=icc ;
%endif

%if "%(case %realversion in (*_CLANG_X*) echo true ;; (*) echo false ;; esac)" == "true"
%define branch %(echo %realversion | sed -e 's|_CLANG_X.*|_X|')
%define preBuildCommand scram setup llvm-cxxcompiler ; scram setup llvm-f77compiler ; scram setup llvm-ccompiler ; perl -p -i -e 's|<client>|<client><flags DEFAULT_COMPILER="llvm"/>|' %i/config/Self.xml
%define preBuildCommand scram setup llvm-cxxcompiler ; scram setup llvm-f77compiler ; scram setup llvm-ccompiler ; perl -p -i -e 's|<client>|<client><flags DEFAULT_COMPILER="llvm"/>|' %i/config/Self.xml; export COMPILER=llvm ;
%endif

## IMPORT cmssw-patch-build
Expand Down
2 changes: 1 addition & 1 deletion cmssw-tool-conf.spec
Expand Up @@ -131,7 +131,6 @@ Requires: fasthadd

# Only for Linux platform.
%if %islinux
Requires: glibc-toolfile
Requires: openldap-toolfile
Requires: python-ldap-toolfile
Requires: gdb-toolfile
Expand All @@ -153,6 +152,7 @@ Requires: oracle-toolfile
# Only for Linux platform.
%if %islinux
Requires: igprof-toolfile
Requires: glibc-toolfile
%endif
%endif

Expand Down
1 change: 1 addition & 0 deletions cmssw-toolfile.spec
Expand Up @@ -15,6 +15,7 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/cmssw.xml
<environment name="CMSSW_BINDIR" default="$CMSSW_BASE/bin/$SCRAM_ARCH"/>
<environment name="INCLUDE" default="$CMSSW_BASE/src"/>
</client>
<runtime name="@OS_RUNTIME_LDPATH_NAME@" value="$CMSSW_BASE/biglib/$SCRAM_ARCH" type="path"/>
<runtime name="@OS_RUNTIME_LDPATH_NAME@" value="$CMSSW_BASE/lib/$SCRAM_ARCH" type="path"/>
<runtime name="PATH" value="$CMSSW_BINDIR" type="path"/>
<runtime name="PYTHONPATH" value="$CMSSW_BINDIR" type="path"/>
Expand Down
134 changes: 0 additions & 134 deletions dcap-2.47.5.0-fork-safety.patch

This file was deleted.

0 comments on commit f6cf2f4

Please sign in to comment.