Merge pull request cms-sw#79 from davidlt/IB/CMSSW_6_2_X/stable

[IB/CMSSW_6_2_X/stable] DAS, ICC, GDB, GIT, LHAPDF, NCURSES

cmssw-tool-conf.spec

@@ -118,6 +118,7 @@ Requires: gnuplot-toolfile
 Requires: sloccount-toolfile
 Requires: cvs2git-toolfile
 Requires: pacparser-toolfile
+Requires: git-toolfile
 
 %if "%isslc" == "true"
 Requires: openldap-toolfile
@@ -133,7 +134,7 @@ Requires: nss-toolfile
 Requires: cyrus-sasl-toolfile
 %endif
 
-%define skipreqtools jcompiler lhapdfwrapfull lhapdffull icc-cxxcompiler icc-ccompiler icc-f77compiler
+%define skipreqtools jcompiler lhapdfwrapfull lhapdffull icc-cxxcompiler icc-ccompiler icc-f77compiler git
 
 ## IMPORT scramv1-tool-conf
 

das-client.spec

@@ -1,4 +1,4 @@
-### RPM cms das-client 1.9.5
+### RPM cms das-client 1.11.7
 ## INITENV +PATH PYTHONPATH %i/bin/
 ## NOCOMPILER
 

gdb.spec

@@ -1,17 +1,26 @@
 ### RPM external gdb 7.6
 Source: http://ftp.gnu.org/gnu/%{n}/%{n}-%{realversion}.tar.bz2
 Patch0: gdb-7.6-fix-pythonhome
-Requires: python ncurses zlib
+Requires: python ncurses zlib xz expat
 
 %prep
 %setup -n %n-%realversion
 %patch0 -p1
 
+
 %build
 export PYTHONV=$(echo $PYTHON_VERSION | cut -f1,2 -d.)
-./configure --prefix=%{i} --with-system-gdbinit=%{i}/share/gdbinit --with-expat=no  --with-zlib=yes --with-python=${PYTHON_ROOT} \
-            LDFLAGS="-L${PYTHON_ROOT}/lib -L${NCURSES_ROOT}/lib -L${ZLIB_ROOT}/lib" \
-            CFLAGS="-Wno-error=strict-aliasing -I${PYTHON_ROOT}/include -I${NCURSES_ROOT}/include -I${ZLIB_ROOT}/include"
+./configure --prefix=%{i} \
+            --disable-rpath \
+            --with-system-gdbinit=%{i}/share/gdbinit \
+            --with-expat=yes \
+            --with-libexpat-prefix=${EXPAT_ROOT} \
+            --with-zlib=yes \
+            --with-python=${PYTHON_ROOT} \
+            --with-lzma=yes \
+            --with-liblzma-prefix=${XZ_ROOT} \
+            LDFLAGS="-L${PYTHON_ROOT}/lib -L${NCURSES_ROOT}/lib -L${ZLIB_ROOT}/lib -L${EXPAT_ROOT}/lib -L${XZ_ROOT}/lib" \
+            CFLAGS="-Wno-error=strict-aliasing -I${PYTHON_ROOT}/include -I${NCURSES_ROOT}/include -I${ZLIB_ROOT}/include -I${EXPAT_ROOT}/include -I${XZ_ROOT}/include"
 make %makeprocesses
 
 %install

git-1.8.3.1-no-symlink.patch

@@ -0,0 +1,53 @@
+diff --git a/Makefile b/Makefile
+index 0f931a2..db0d69e 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1705,8 +1705,6 @@ version.sp version.s version.o: EXTRA_CPPFLAGS = \
+
+ $(BUILT_INS): git$X
+ 	$(QUIET_BUILT_IN)$(RM) $@ && \
+-	ln git$X $@ 2>/dev/null || \
+-	ln -s git$X $@ 2>/dev/null || \
+ 	cp git$X $@
+
+ common-cmds.h: ./generate-cmdlist.sh command-list.txt
+@@ -2026,8 +2024,6 @@ git-remote-testsvn$X: remote-testsvn.o GIT-LDFLAGS $(GITLIBS) $(VCSSVN_LIB)
+
+ $(REMOTE_CURL_ALIASES): $(REMOTE_CURL_PRIMARY)
+ 	$(QUIET_LNCP)$(RM) $@ && \
+-	ln $< $@ 2>/dev/null || \
+-	ln -s $< $@ 2>/dev/null || \
+ 	cp $< $@
+
+ $(REMOTE_CURL_PRIMARY): remote-curl.o http.o http-walker.o GIT-LDFLAGS $(GITLIBS)
+@@ -2326,30 +2322,23 @@ endif
+ 	  for p in git$X $(filter $(install_bindir_programs),$(ALL_PROGRAMS)); do \
+ 		$(RM) "$$execdir/$$p" && \
+ 		test -z "$(NO_INSTALL_HARDLINKS)$(NO_CROSS_DIRECTORY_HARDLINKS)" && \
+-		ln "$$bindir/$$p" "$$execdir/$$p" 2>/dev/null || \
+ 		cp "$$bindir/$$p" "$$execdir/$$p" || exit; \
+ 	  done; \
+ 	} && \
+ 	for p in $(filter $(install_bindir_programs),$(BUILT_INS)); do \
+ 		$(RM) "$$bindir/$$p" && \
+ 		test -z "$(NO_INSTALL_HARDLINKS)" && \
+-		ln "$$bindir/git$X" "$$bindir/$$p" 2>/dev/null || \
+-		ln -s "git$X" "$$bindir/$$p" 2>/dev/null || \
+ 		cp "$$bindir/git$X" "$$bindir/$$p" || exit; \
+ 	done && \
+ 	for p in $(BUILT_INS); do \
+ 		$(RM) "$$execdir/$$p" && \
+ 		test -z "$(NO_INSTALL_HARDLINKS)" && \
+-		ln "$$execdir/git$X" "$$execdir/$$p" 2>/dev/null || \
+-		ln -s "git$X" "$$execdir/$$p" 2>/dev/null || \
+ 		cp "$$execdir/git$X" "$$execdir/$$p" || exit; \
+ 	done && \
+ 	remote_curl_aliases="$(REMOTE_CURL_ALIASES)" && \
+ 	for p in $$remote_curl_aliases; do \
+ 		$(RM) "$$execdir/$$p" && \
+ 		test -z "$(NO_INSTALL_HARDLINKS)" && \
+-		ln "$$execdir/git-remote-http$X" "$$execdir/$$p" 2>/dev/null || \
+-		ln -s "git-remote-http$X" "$$execdir/$$p" 2>/dev/null || \
+ 		cp "$$execdir/git-remote-http$X" "$$execdir/$$p" || exit; \
+ 	done && \
+ 	./check_bindir "z$$bindir" "z$$execdir" "$$bindir/git-add$X"

git-toolfile.spec

@@ -0,0 +1,22 @@
+### RPM external git-toolfile 1.0
+Requires: git
+%prep
+
+%build
+
+%install
+
+mkdir -p %{i}/etc/scram.d
+cat << \EOF_TOOLFILE >%{i}/etc/scram.d/git.xml
+<tool name="git" version="@TOOL_VERSION@">
+  <info url="http://git-scm.com"/>
+  <client>
+    <environment name="GIT_BASE" default="@TOOL_ROOT@"/>
+  </client>
+  <runtime name="PATH" value="$GIT_BASE/bin" type="path"/>
+  <runtime name="PATH" value="$GIT_BASE/libexec/git-core" type="path"/>
+  <runtime name="GIT_TEMPLATE_DIR" value="$GIT_BASE/share/git-core/templates" type="path"/>
+</tool>
+EOF_TOOLFILE
+
+## IMPORT scram-tools-post

git.spec

@@ -0,0 +1,57 @@
+### RPM external git 1.8.3.1
+
+%define isDarwin %(case %{cmsos} in (osx*) echo 1 ;; (*) echo 0 ;; esac)
+
+Source: https://github.com/git/git/archive/v%{realversion}.tar.gz
+Patch1: git-1.8.3.1-no-symlink
+
+Requires: curl expat openssl zlib pcre
+
+%prep
+%setup -n %{n}-%{realversion}
+%patch1 -p1
+
+%build
+make prefix=%{i} \
+%if %isDarwin
+     NO_DARWIN_PORTS=1 \
+     NO_FINK=1 \
+%endif
+     CURLDIR="${CURL_ROOT}" \
+     OPENSSLDIR="${OPENSSL_ROOT}" \
+     EXPATDIR="${EXPAT_ROOT}" \
+     ZLIB_PATH="${ZLIB_ROOT}" \
+     USE_LIBPCRE=1 \
+     NO_GETTEXT=1 \
+     NO_R_TO_GCC_LINKER=1 \
+     LIBPCREDIR="${PCRE_ROOT}" \
+     NO_PYTHON=1 \
+     NO_PERL=1 \
+     V=1 \
+     %{makeprocesses} \
+     all
+
+%install
+make prefix=%{i} \
+%if %isDarwin
+     NO_DARWIN_PORTS=1 \
+     NO_FINK=1 \
+%endif
+     CURLDIR="${CURL_ROOT}" \
+     OPENSSLDIR="${OPENSSL_ROOT}" \
+     EXPATDIR="${EXPAT_ROOT}" \
+     ZLIB_PATH="${ZLIB_ROOT}" \
+     USE_LIBPCRE=1 \
+     NO_GETTEXT=1 \
+     NO_R_TO_GCC_LINKER=1 \
+     LIBPCREDIR="${PCRE_ROOT}" \
+     NO_PYTHON=1 \
+     NO_PERL=1 \
+     V=1 \
+     %{makeprocesses} \
+     install
+
+%post
+%{relocateConfig}libexec/git-core/git-sh-i18n
+%{relocateConfig}libexec/git-core/git-citool
+%{relocateConfig}libexec/git-core/git-gui

icc-gcc-toolfile.spec

@@ -51,9 +51,12 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/icc-cxxcompiler.xml
     <flags REM_CXXFLAGS="-Werror=format-contains-nul"/>
     <flags REM_CXXFLAGS="-Wunknown-pragmas"/>
     <flags REM_CXXFLAGS="-ftree-vectorize"/>
+    <flags REM_CXXFLAGS="-Wno-unused-local-typedefs"/>
+    <flags REM_CXXFLAGS="-std=c++0x"/>
     <flags REM_LDFLAGS="-Wl,--icf=all"/>
     <flags CXXFLAGS="-Wno-unknown-pragmas"/>
     <flags CXXFLAGS="-axSSE3"/>
+    <flags CXXFLAGS="-std=c++11"/>
     <runtime name="@OS_RUNTIME_LDPATH_NAME@" value="$ICC_CXXCOMPILER_BASE/compiler/lib/intel64" type="path" handler="warn"/>
     <runtime name="PATH" value="$ICC_CXXCOMPILER_BASE/bin/intel64" type="path" handler="warn"/>
     <runtime name="COMPILER_RUNTIME_OBJECTS" value="@GCC_ROOT@" handler="warn"/>

lhapdf.spec

@@ -6,8 +6,8 @@ Patch1: lhapdf-5.8.5-gzio
 Patch2: lhapdf-data-5.8.5-gzio
 Patch3: lhapdf-5.8.5-disable-examples-and-tests
 
-Requires: zlib
-BuildRequires: autotools
+Requires: zlib python
+BuildRequires: autotools swig
 
 %define keep_archives true
 %if "%(case %{cmsplatf} in (osx*_*_gcc421) echo true ;; (*) echo false ;; esac)" == "true"
@@ -57,7 +57,7 @@ CXX="`which %{cms_cxx}` -fPIC"
 CC="`which gcc` -fPIC"
 
 # Configure first with low memory.
-./configure --prefix=%{i} --enable-static --disable-shared --disable-pyext \
+./configure --prefix=%{i} --enable-static --disable-shared --enable-pyext \
             --disable-octave --disable-doxygen --enable-low-memory \
             --with-max-num-pdfsets=1 \
             FC="$FC" CXX="$CXX" CC="$CC" \
@@ -76,7 +76,7 @@ popd
 # do another install-round for full libs
 make distclean
 ./configure --prefix=%{i}/full --enable-static --disable-shared \
-            --disable-pyext --disable-octave --disable-doxygen \
+            --enable-pyext --disable-octave --disable-doxygen \
             FC="$FC" CXX="$CXX" CC="$CC" \
             CPPFLAGS="-I ${ZLIB_ROOT}/include" CXXFLAGS="%cms_cxxflags" LDFLAGS="-L${ZLIB_ROOT}/lib -lz"
 make %{makeprocesses}
@@ -85,6 +85,9 @@ make install
 # Remove all libtool archives
 find %{i} -name '*.la' -exec rm -f {} \;
 
+# Remove egg-info
+find %{i} -name '*.egg-info' -delete
+
 %post
 %{relocateConfig}bin/lhapdf-config
 %{relocateConfig}full/bin/lhapdf-config

ncurses.spec

@@ -1,5 +1,5 @@
 ### RPM external ncurses 5.5
-Source: http://ftp.gnu.org/pub/gnu/ncurses/%{n}-%{v}.tar.gz
+Source: http://ftp.gnu.org/pub/gnu/ncurses/%{n}-%{realversion}.tar.gz
 
 %build
 ./configure --prefix=%i --with-shared --enable-symlinks

root-5.34.07-fix-fatal-removal-in-branch-names.patch

@@ -0,0 +1,43 @@
+From b54356e5cd8e17b8848ae6ce9f7b27145d5059d2 Mon Sep 17 00:00:00 2001
+From: Philippe Canal <[email protected]>
+Date: Thu, 6 Jun 2013 15:17:32 -0500
+Subject: [PATCH] Fix spurrious (fatal) removal of duplicate part of branch
+ names.
+
+Since v5-34-06 (specifically commit b454e81), a TTree fails to save
+the content of a branch that is part of a split STL collection and
+whose name (of the data member) match some other component of the
+branch name (and the two must be separted my at least one level).
+
+For example out.OBJ.vec.OBJect
+or TH1DMEtoEDM_MEtoEDMConverter_MEtoEDMConverterRun_TEST.obj.MEtoEdmObject.object.
+
+When reading the file back in v5-34-06, 07 or 08, this will result
+in the data not being written and the missing data not being noticed in any way
+by the I/O .. but of course, it is not being read.
+
+When reading the file back with v5-34-05 or below, this can result
+in error messages like:
+
+  Error in <TBufferFile::ReadVersion>: Could not find the StreamerInfo with a checksum of 0x20000 for the class "TH1F" in output.root.
+---
+ tree/tree/src/TBranchElement.cxx | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/tree/tree/src/TBranchElement.cxx b/tree/tree/src/TBranchElement.cxx
+index 286238d..0277a30 100644
+--- a/tree/tree/src/TBranchElement.cxx
++++ b/tree/tree/src/TBranchElement.cxx
+@@ -3008,7 +3008,8 @@ void TBranchElement::InitializeOffsets()
+             //-----------------------------------------------------------------
+             if( stlParentName.Length() )
+             {
+-               if( !strncmp( stlParentName.Data(), dataName.Data(), stlParentName.Length()-1 ))
++               if( !strncmp( stlParentName.Data(), dataName.Data(), stlParentName.Length()-1 )
++                   && dataName[ stlParentName.Length() ] == '.' )
+                   dataName.Remove( 0, stlParentName.Length()+1 );
+             }
+
+-- 
+1.8.2
+

root.spec

@@ -14,6 +14,7 @@ Patch2: root-5.34.00-linker-gnu-hash-style
 Patch3: root-5.32.00-detect-arch
 Patch4: root-5.30.02-fix-gcc46
 Patch5: root-5.30.02-fix-isnan-again
+Patch6: root-5.34.07-fix-fatal-removal-in-branch-names
 
 %define cpu %(echo %cmsplatf | cut -d_ -f2)
 
@@ -43,6 +44,7 @@ Requires: freetype
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
 # The following patch can only be applied on SLC5 or later (extra linker
 # options only available with the SLC5 binutils)

scram-project-build.file

@@ -35,7 +35,7 @@ Requires: SCRAMV1
 %endif
 
 %if "%{?configtag:set}" != "set"
-%define configtag       V05-01-00
+%define configtag       V05-01-01
 %endif
 
 %if "%{?useCmsTC:set}" != "set"

xz-toolfile.spec

@@ -1,4 +1,4 @@
-### RPM external xz-toolfile 1.0
+### RPM external xz-toolfile 1.1
 Requires: xz
 
 %prep
@@ -14,6 +14,7 @@ cat << \EOF_TOOLFILE > %i/etc/scram.d/xz.xml
       <environment name="LIBDIR" default="$XZ_BASE/lib"/>
       <environment name="INCLUDE" default="$XZ_BASE/include"/>
     </client>
+    <runtime name="PATH" value="$XZ_BASE/bin" type="path"/>
   </tool>
 EOF_TOOLFILE
 ## IMPORT scram-tools-post