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

Move to root6. #1459

Merged
merged 1 commit into from Mar 23, 2015
Merged

Move to root6. #1459

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 11 additions & 0 deletions boost-1.51.0-define-BOOST_SP_USE_SPINLOCK.patch
View file
Open in desktop
@@ -0,0 +1,11 @@
diff --git a/boost/config/user.hpp b/boost/config/user.hpp
index 5a4a9d4..8c7f353 100644
--- a/boost/config/user.hpp
+++ b/boost/config/user.hpp
@@ -121,4 +121,5 @@
// #define BOOST_WHATEVER_NO_LIB


-
+// Do not use inline assembly for atomic operations
+#define BOOST_SP_USE_SPINLOCK
12 changes: 12 additions & 0 deletions boost-1.57.0-define-BOOST_SP_USE_SPINLOCK.patch
View file
Open in desktop
@@ -0,0 +1,12 @@
diff --git a/boost/config/user.hpp b/boost/config/user.hpp
index fbe10bf..bb95c39 100644
--- a/boost/config/user.hpp
+++ b/boost/config/user.hpp
@@ -138,3 +138,7 @@
// dictionary (CMSSW, C++11). The following forces to use C++03 hack even if C++11 is
// enabled.
#define BOOST_NO_CXX11_EXPLICIT_CONVERSION_OPERATORS
+
+// Do not use inline assembly for atomic operations until ROOT6 can handle inline
+// assembly. This could happen with MCJIT support (middle of 2015).
+#define BOOST_SP_USE_SPINLOCK
7 changes: 6 additions & 1 deletion boost-toolfile.spec
View file
Open in desktop
Expand Up @@ -20,6 +20,8 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/boost.xml
<environment name="INCLUDE" default="$BOOST_BASE/include"/>
</client>
<runtime name="CMSSW_FWLITE_INCLUDE_PATH" value="$BOOST_BASE/include" type="path"/>
<runtime name="ROOT_INCLUDE_PATH" value="$INCLUDE" type="path"/>
<use name="root_cxxdefaults"/>
<flags CPPDEFINES="BOOST_SPIRIT_THREADSAFE PHOENIX_THREADSAFE"/>
<use name="sockets"/>
</tool>
Expand Down Expand Up @@ -64,7 +66,8 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/boost_python.xml
<environment name="LIBDIR" default="$BOOST_PYTHON_BASE/lib"/>
<environment name="INCLUDE" default="$BOOST_PYTHON_BASE/include"/>
</client>
<use name="gccxml"/>
<runtime name="ROOT_INCLUDE_PATH" value="$INCLUDE" type="path"/>
<use name="root_cxxdefaults"/>
<use name="python"/>
</tool>
EOF_TOOLFILE
Expand Down Expand Up @@ -119,6 +122,8 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/boost_header.xml
<environment name="BOOSTHEADER_BASE" default="@TOOL_ROOT@"/>
<environment name="INCLUDE" default="$BOOSTHEADER_BASE/include"/>
</client>
<runtime name="ROOT_INCLUDE_PATH" value="$INCLUDE" type="path"/>
<use name="root_cxxdefaults"/>
</tool>
EOF_TOOLFILE

Expand Down
2 changes: 2 additions & 0 deletions boost.spec
View file
Open in desktop
Expand Up @@ -14,12 +14,14 @@ Requires: zlib
Patch0: boost-1.47.0-fix-strict-overflow
Patch1: boost-1.47.0-fix-unused
Patch2: boost-1.49.0-explicit_stored_group
Patch3: boost-1.51.0-define-BOOST_SP_USE_SPINLOCK

%prep
%setup -n %{n}%{boostver}
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1

perl -p -i -e 's/-no-cpp-precomp//' tools/build/v2/tools/darwin.jam \
tools/build/v2/tools/darwin.py
Expand Down
2 changes: 2 additions & 0 deletions bz2lib-toolfile.spec
View file
Open in desktop
Expand Up @@ -16,6 +16,8 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/bz2lib.xml
<environment name="LIBDIR" default="$BZ2LIB_BASE/lib"/>
<environment name="INCLUDE" default="$BZ2LIB_BASE/include"/>
</client>
<runtime name="ROOT_INCLUDE_PATH" value="$INCLUDE" type="path"/>
<use name="root_cxxdefaults"/>
</tool>
EOF_TOOLFILE

Expand Down
2 changes: 2 additions & 0 deletions cascade-toolfile.spec
View file
Open in desktop
Expand Up @@ -39,6 +39,8 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/cascade_headers.xml
<environment name="CASCADE_HEADERS_BASE" default="@TOOL_ROOT@"/>
<environment name="INCLUDE" default="$CASCADE_HEADERS_BASE/include"/>
</client>
<runtime name="ROOT_INCLUDE_PATH" value="$INCLUDE" type="path"/>
<use name="root_cxxdefaults"/>
</tool>
EOF_TOOLFILE

Expand Down
3 changes: 3 additions & 0 deletions castor-toolfile.spec
View file
Open in desktop
Expand Up @@ -14,6 +14,9 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/castor_header.xml
<environment name="INCLUDE" default="$CASTOR_HEADER_BASE/include"/>
<environment name="INCLUDE" default="$CASTOR_HEADER_BASE/include/shift"/>
</client>
<runtime name="ROOT_INCLUDE_PATH" value="$CASTOR_HEADER_BASE/include" type="path"/>
<runtime name="ROOT_INCLUDE_PATH" value="$CASTOR_HEADER_BASE/include/shift" type="path"/>
<use name="root_cxxdefaults"/>
</tool>
EOF_TOOLFILE
cat << \EOF_TOOLFILE >%i/etc/scram.d/castor.xml
Expand Down
2 changes: 2 additions & 0 deletions cgal-toolfile.spec
View file
Open in desktop
Expand Up @@ -19,6 +19,8 @@ cat << \EOF_TOOLFILE >%{i}/etc/scram.d/cgal.xml
<environment name="LIBDIR" default="$CGAL_BASE/lib"/>
<environment name="INCLUDE" default="$CGAL_BASE/include"/>
</client>
<runtime name="ROOT_INCLUDE_PATH" value="$INCLUDE" type="path"/>
<use name="root_cxxdefaults"/>
<use name="zlib"/>
<use name="boost_system"/>
<use name="gmp"/>
Expand Down
2 changes: 2 additions & 0 deletions charybdis-toolfile.spec
View file
Open in desktop
Expand Up @@ -16,6 +16,8 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/charybdis.xml
<environment name="LIBDIR" default="$CHARYBDIS_BASE/lib"/>
<environment name="INCLUDE" default="$CHARYBDIS_BASE/include"/>
</client>
<runtime name="ROOT_INCLUDE_PATH" value="$INCLUDE" type="path"/>
<use name="root_cxxdefaults"/>
<use name="f77compiler"/>
<use name="herwig"/>
<use name="pythia6"/>
Expand Down
2 changes: 2 additions & 0 deletions classlib-toolfile.spec
View file
Open in desktop
Expand Up @@ -22,6 +22,8 @@ cat << \EOF_TOOLFILE > %i/etc/scram.d/classlib.xml
<use name="pcre"/>
<use name="openssl"/>
</client>
<runtime name="ROOT_INCLUDE_PATH" value="$INCLUDE" type="path"/>
<use name="root_cxxdefaults"/>
</tool>
EOF_TOOLFILE
## IMPORT scram-tools-post
4 changes: 4 additions & 0 deletions clhep-toolfile.spec
View file
Open in desktop
Expand Up @@ -18,6 +18,8 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/clhep.xml
</client>
<runtime name="CLHEP_PARAM_PATH" value="$CLHEP_BASE"/>
<runtime name="CMSSW_FWLITE_INCLUDE_PATH" value="$CLHEP_BASE/include" type="path"/>
<runtime name="ROOT_INCLUDE_PATH" value="$INCLUDE" type="path"/>
<use name="root_cxxdefaults"/>
</tool>
EOF_TOOLFILE

Expand All @@ -28,6 +30,8 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/clhepheader.xml
<environment name="CLHEPHEADER_BASE" default="@TOOL_ROOT@"/>
<environment name="INCLUDE" default="$CLHEPHEADER_BASE/include"/>
</client>
<runtime name="ROOT_INCLUDE_PATH" value="$INCLUDE" type="path"/>
<use name="root_cxxdefaults"/>
</tool>
EOF_TOOLFILE

Expand Down
1 change: 0 additions & 1 deletion cmssw-tool-conf.spec
View file
Open in desktop
Expand Up @@ -61,7 +61,6 @@ Requires: pythia6-toolfile
Requires: pythia8-toolfile
Requires: python-toolfile
Requires: qt-toolfile
Requires: roofit-toolfile
Requires: root-toolfile
Requires: sherpa-toolfile
Requires: sigcpp-toolfile
Expand Down
2 changes: 2 additions & 0 deletions cmssw-toolfile.spec
View file
Open in desktop
Expand Up @@ -20,6 +20,8 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/cmssw.xml
<runtime name="PATH" value="$CMSSW_BINDIR" type="path"/>
<runtime name="PYTHONPATH" value="$CMSSW_BINDIR" type="path"/>
<runtime name="PYTHONPATH" value="$LIBDIR" type="path"/>
<runtime name="ROOT_INCLUDE_PATH" value="$INCLUDE" type="path"/>
<use name="root_cxxdefaults"/>
</tool>
EOF_TOOLFILE

Expand Down
4 changes: 4 additions & 0 deletions cmssw.spec
View file
Open in desktop
Expand Up @@ -52,6 +52,10 @@ Patch0: boost-1.57.0-icc
%define branch %(echo %realversion | sed -e 's|_X.*|_X|')
%endif

%if "%(case %realversion in (*_ROOT6_X*) echo true ;; (*) echo false ;; esac)" == "true"
%define branch %(echo %realversion | sed -e 's|_X.*|_X|')
%endif

%define source1 git://github.com/cms-sw/cmssw.git?protocol=https&obj=%{branch}/%{gitcommit}&module=%{cvssrc}&export=%{srctree}&output=/src.tar.gz

## IMPORT scram-project-build
Expand Down
2 changes: 2 additions & 0 deletions coral-toolfile.spec
View file
Open in desktop
Expand Up @@ -16,6 +16,8 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/coral.xml
</client>
<runtime name="PYTHONPATH" default="$CORAL_BASE/$SCRAM_ARCH/python" type="path"/>
<runtime name="PYTHONPATH" default="$CORAL_BASE/$SCRAM_ARCH/lib" type="path"/>
<runtime name="ROOT_INCLUDE_PATH" value="$INCLUDE" type="path"/>
<use name="root_cxxdefaults"/>
</tool>
EOF_TOOLFILE

Expand Down
2 changes: 2 additions & 0 deletions cppunit-toolfile.spec
View file
Open in desktop
Expand Up @@ -15,6 +15,8 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/cppunit.xml
<environment name="LIBDIR" default="$CPPUNIT_BASE/lib"/>
<environment name="INCLUDE" default="$CPPUNIT_BASE/include"/>
</client>
<runtime name="ROOT_INCLUDE_PATH" value="$INCLUDE" type="path"/>
<use name="root_cxxdefaults"/>
<use name="sockets"/>
</tool>
EOF_TOOLFILE
Expand Down
2 changes: 2 additions & 0 deletions curl-toolfile.spec
View file
Open in desktop
Expand Up @@ -16,6 +16,8 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/curl.xml
<environment name="LIBDIR" default="$CURL_BASE/lib"/>
</client>
<runtime name="PATH" value="$CURL_BASE/bin" type="path"/>
<runtime name="ROOT_INCLUDE_PATH" value="$INCLUDE" type="path"/>
<use name="root_cxxdefaults"/>
</tool>
EOF_TOOLFILE

Expand Down
2 changes: 2 additions & 0 deletions db4-toolfile.spec
View file
Open in desktop
Expand Up @@ -17,6 +17,8 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/db4.xml
<environment name="BINDIR" default="$DB4_BASE/bin"/>
</client>
<runtime name="PATH" value="$BINDIR" type="path"/>
<runtime name="ROOT_INCLUDE_PATH" value="$INCLUDE" type="path"/>
<use name="root_cxxdefaults"/>
</tool>
EOF_TOOLFILE

Expand Down
2 changes: 2 additions & 0 deletions dcap-toolfile.spec
View file
Open in desktop
Expand Up @@ -15,6 +15,8 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/dcap.xml
<environment name="LIBDIR" default="$DCAP_BASE/lib"/>
<environment name="INCLUDE" default="$DCAP_BASE/include"/>
</client>
<runtime name="ROOT_INCLUDE_PATH" value="$INCLUDE" type="path"/>
<use name="root_cxxdefaults"/>
</tool>
EOF_TOOLFILE

Expand Down
2 changes: 2 additions & 0 deletions dpm-toolfile.spec
View file
Open in desktop
Expand Up @@ -15,6 +15,8 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/dpm.xml
<environment name="INCLUDE" default="$DPM_BASE/include"/>
<environment name="LIBDIR" default="$DPM_BASE/lib"/>
</client>
<runtime name="ROOT_INCLUDE_PATH" value="$INCLUDE" type="path"/>
<use name="root_cxxdefaults"/>
</tool>
EOF_TOOLFILE

Expand Down
2 changes: 2 additions & 0 deletions evtgenlhc-toolfile.spec
View file
Open in desktop
Expand Up @@ -15,6 +15,8 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/evtgenlhc.xml
<environment name="LIBDIR" default="$EVTGENLHC_BASE/lib"/>
<environment name="INCLUDE" default="$EVTGENLHC_BASE"/>
</client>
<runtime name="ROOT_INCLUDE_PATH" value="$INCLUDE" type="path"/>
<use name="root_cxxdefaults"/>
<use name="clhep"/>
</tool>
EOF_TOOLFILE
Expand Down
2 changes: 2 additions & 0 deletions expat-toolfile.spec
View file
Open in desktop
Expand Up @@ -17,6 +17,8 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/expat.xml
<environment name="BINDIR" default="$EXPAT_BASE/bin"/>
</client>
<runtime name="PATH" value="$BINDIR" type="path"/>
<runtime name="ROOT_INCLUDE_PATH" value="$INCLUDE" type="path"/>
<use name="root_cxxdefaults"/>
</tool>
EOF_TOOLFILE

Expand Down
2 changes: 2 additions & 0 deletions fastjet-toolfile.spec
View file
Open in desktop
Expand Up @@ -20,6 +20,8 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/fastjet.xml
<environment name="LIBDIR" default="$FASTJET_BASE/lib"/>
<environment name="INCLUDE" default="$FASTJET_BASE/include"/>
</client>
<runtime name="ROOT_INCLUDE_PATH" value="$INCLUDE" type="path"/>
<use name="root_cxxdefaults"/>
</tool>
EOF_TOOLFILE

Expand Down
2 changes: 2 additions & 0 deletions fftjet-toolfile.spec
View file
Open in desktop
Expand Up @@ -15,6 +15,8 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/fftjet.xml
<environment name="LIBDIR" default="$FFTJET_BASE/lib"/>
<environment name="INCLUDE" default="$FFTJET_BASE/include"/>
</client>
<runtime name="ROOT_INCLUDE_PATH" value="$INCLUDE" type="path"/>
<use name="root_cxxdefaults"/>
</tool>
EOF_TOOLFILE

Expand Down
2 changes: 2 additions & 0 deletions fftw3-toolfile.spec
View file
Open in desktop
Expand Up @@ -15,6 +15,8 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/fftw3.xml
<environment name="INCLUDE" default="$FFTW3_BASE/include"/>
<environment name="LIBDIR" default="$FFTW3_BASE/lib"/>
</client>
<runtime name="ROOT_INCLUDE_PATH" value="$INCLUDE" type="path"/>
<use name="root_cxxdefaults"/>
</tool>
EOF_TOOLFILE

Expand Down
2 changes: 2 additions & 0 deletions freetype-toolfile.spec
View file
Open in desktop
Expand Up @@ -16,6 +16,8 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/freetype.xml
<environment name="LIBDIR" default="$FREETYPE_BASE/lib"/>
</client>
<runtime name="PATH" value="$FREETYPE_BASE/bin" type="path"/>
<runtime name="ROOT_INCLUDE_PATH" value="$INCLUDE" type="path"/>
<use name="root_cxxdefaults"/>
</tool>
EOF_TOOLFILE

Expand Down
2 changes: 2 additions & 0 deletions frontier_client-toolfile.spec
View file
Open in desktop
Expand Up @@ -16,6 +16,8 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/frontier_client.xml
<environment name="LIBDIR" default="$FRONTIER_CLIENT_BASE/lib"/>
</client>
<runtime name="FRONTIER_CLIENT" value="$FRONTIER_CLIENT_BASE/"/>
<runtime name="ROOT_INCLUDE_PATH" value="$INCLUDE" type="path"/>
<use name="root_cxxdefaults"/>
<use name="zlib"/>
<use name="openssl"/>
<use name="expat"/>
Expand Down
2 changes: 2 additions & 0 deletions gdbm-toolfile.spec
View file
Open in desktop
Expand Up @@ -15,6 +15,8 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/gdbm.xml
<environment name="LIBDIR" default="$GDBM_BASE/lib"/>
<environment name="INCLUDE" default="$GDBM_BASE/include"/>
</client>
<runtime name="ROOT_INCLUDE_PATH" value="$INCLUDE" type="path"/>
<use name="root_cxxdefaults"/>
</tool>
EOF_TOOLFILE

Expand Down
2 changes: 2 additions & 0 deletions geant4-toolfile.spec
View file
Open in desktop
Expand Up @@ -43,8 +43,10 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/geant4core.xml
<environment name="G4LIB" value="$LIBDIR"/>
<environment name="INCLUDE" default="$GEANT4CORE_BASE/include/Geant4"/>
</client>
<runtime name="ROOT_INCLUDE_PATH" value="$INCLUDE" type="path"/>
<flags cppdefines="GNU_GCC G4V9"/>
<use name="clhep"/>
<use name="root_cxxdefaults"/>
</tool>
EOF_TOOLFILE

Expand Down
2 changes: 2 additions & 0 deletions gsl-toolfile.spec
View file
Open in desktop
Expand Up @@ -17,6 +17,8 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/gsl.xml
<environment name="LIBDIR" default="$GSL_BASE/lib"/>
<environment name="INCLUDE" default="$GSL_BASE/include"/>
</client>
<runtime name="ROOT_INCLUDE_PATH" value="$INCLUDE" type="path"/>
<use name="root_cxxdefaults"/>
</tool>
EOF_TOOLFILE

Expand Down
2 changes: 2 additions & 0 deletions hector-toolfile.spec
View file
Open in desktop
Expand Up @@ -16,6 +16,8 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/hector.xml
<environment name="LIBDIR" default="$HECTOR_BASE/lib"/>
<environment name="INCLUDE" default="$HECTOR_BASE/include"/>
</client>
<runtime name="ROOT_INCLUDE_PATH" value="$INCLUDE" type="path"/>
<use name="root_cxxdefaults"/>
</tool>
EOF_TOOLFILE

Expand Down
4 changes: 2 additions & 2 deletions hector.spec
View file
Open in desktop
Expand Up @@ -10,7 +10,7 @@ Requires: root
%endif

%if "%{?cms_cxxflags:set}" != "set"
%define cms_cxxflags -std=c++0x
%define cms_cxxflags -std=c++11
%endif

%prep
Expand All @@ -22,7 +22,7 @@ mkdir -p obj lib
# We simply ignore the stripping.
perl -p -i -e "s|^.*[@]strip.*\n||" Makefile
# Correct link path for root.
perl -p -i -e "s|^ROOTLIBS.*$|ROOTLIBS=-L$ROOT_ROOT/lib -lCore -lRint -lMatrix -lPhysics -lCint -lMathCore -pthread -lm -ldl -rdynamic|" Makefile
#perl -p -i -e "s|^ROOTLIBS.*$|ROOTLIBS=-L$ROOT_ROOT/lib -lCore -lRint -lMatrix -lPhysics -lCling -lMathCore -pthread -lm -ldl -rdynamic|" Makefile
case %cmsplatf in
osx*) perl -p -i -e 's|-rdynamic||g' Makefile ;;
esac
Expand Down
2 changes: 2 additions & 0 deletions hepmc-toolfile.spec
View file
Open in desktop
Expand Up @@ -26,6 +26,8 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/hepmc_headers.xml
<environment name="HEPMC_HEADERS_BASE" default="@TOOL_ROOT@"/>
<environment name="INCLUDE" default="$HEPMC_HEADERS_BASE/include"/>
</client>
<runtime name="ROOT_INCLUDE_PATH" value="$INCLUDE" type="path"/>
<use name="root_cxxdefaults"/>
</tool>
EOF_TOOLFILE

Expand Down
2 changes: 2 additions & 0 deletions heppdt-toolfile.spec
View file
Open in desktop
Expand Up @@ -17,6 +17,8 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/heppdt.xml
<environment name="INCLUDE" default="$HEPPDT_BASE/include"/>
</client>
<runtime name="HEPPDT_PARAM_PATH" value="$HEPPDT_BASE"/>
<runtime name="ROOT_INCLUDE_PATH" value="$INCLUDE" type="path"/>
<use name="root_cxxdefaults"/>
</tool>
EOF_TOOLFILE

Expand Down
2 changes: 2 additions & 0 deletions herwig-toolfile.spec
View file
Open in desktop
Expand Up @@ -16,6 +16,8 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/herwig.xml
<environment name="LIBDIR" default="$HERWIG_BASE/lib"/>
<environment name="INCLUDE" default="$HERWIG_BASE/include"/>
</client>
<runtime name="ROOT_INCLUDE_PATH" value="$INCLUDE" type="path"/>
<use name="root_cxxdefaults"/>
<use name="f77compiler"/>
<use name="lhapdf"/>
<use name="photos"/>
Expand Down
2 changes: 2 additions & 0 deletions herwigpp-toolfile.spec
View file
Open in desktop
Expand Up @@ -15,6 +15,8 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/herwigpp.xml
<environment name="INCLUDE" default="$HERWIGPP_BASE/include"/>
</client>
<runtime name="HERWIGPATH" value="$HERWIGPP_BASE/share/Herwig++"/>
<runtime name="ROOT_INCLUDE_PATH" value="$INCLUDE" type="path"/>
<use name="root_cxxdefaults"/>
</tool>
EOF_TOOLFILE

Expand Down
2 changes: 2 additions & 0 deletions jemalloc-toolfile.spec
View file
Open in desktop
Expand Up @@ -18,6 +18,8 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/jemalloc.xml
<environment name="INCLUDE" default="$JEMALLOC_BASE/include"/>
</client>
<runtime name="MALLOC_CONF" value="lg_chunk:18,lg_dirty_mult:4"/>
<runtime name="ROOT_INCLUDE_PATH" value="$INCLUDE" type="path"/>
<use name="root_cxxdefaults"/>
</tool>
EOF_TOOLFILE

Expand Down
2 changes: 2 additions & 0 deletions jimmy-toolfile.spec
View file
Open in desktop
Expand Up @@ -26,6 +26,8 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/jimmy_headers.xml
<environment name="JIMMY_HEADERS_BASE" default="@TOOL_ROOT@"/>
<environment name="INCLUDE" default="$JIMMY_HEADERS_BASE/include"/>
</client>
<runtime name="ROOT_INCLUDE_PATH" value="$INCLUDE" type="path"/>
<use name="root_cxxdefaults"/>
</tool>
EOF_TOOLFILE

Expand Down