diff options
author | Andrew Savchenko <bircoph@gmail.com> | 2015-04-12 22:21:32 +0300 |
---|---|---|
committer | Justin Lecher <jlec@gentoo.org> | 2015-04-13 08:24:41 +0200 |
commit | cd559bc8acd09f8c6d72b28cf098a064f2b1c406 (patch) | |
tree | 98e4cf0224ff2b1646598b2a0bcd2ee4b0103dec /sci-physics/root/files | |
parent | app-doc/root-docs: 6.02.05 moved to the tree (diff) | |
download | sci-cd559bc8acd09f8c6d72b28cf098a064f2b1c406.tar.gz sci-cd559bc8acd09f8c6d72b28cf098a064f2b1c406.tar.bz2 sci-cd559bc8acd09f8c6d72b28cf098a064f2b1c406.zip |
sci-physics/root: 6.02.05-r2 moved to the tree
Diffstat (limited to 'sci-physics/root/files')
-rw-r--r-- | sci-physics/root/files/root-6.00.01-prop-flags.patch | 17 | ||||
-rw-r--r-- | sci-physics/root/files/root-6.02.05-dictpch.patch | 31 | ||||
-rw-r--r-- | sci-physics/root/files/root-6.02.05-xrootd4.patch | 11 |
3 files changed, 0 insertions, 59 deletions
diff --git a/sci-physics/root/files/root-6.00.01-prop-flags.patch b/sci-physics/root/files/root-6.00.01-prop-flags.patch deleted file mode 100644 index 3a1002478..000000000 --- a/sci-physics/root/files/root-6.00.01-prop-flags.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/config/Makefile.in b/config/Makefile.in -index dd89044..4fc7de3 100644 ---- a/config/Makefile.in -+++ b/config/Makefile.in -@@ -64,9 +64,9 @@ HOST := @host@ - USECONFIG := @useconfig@ - MKLIBOPTIONS := @mkliboption@ - --EXTRA_CFLAGS := -Iinclude @cflags@ --EXTRA_CXXFLAGS := -Iinclude @cflags@ --EXTRA_LDFLAGS := @ldflags@ -+EXTRA_CFLAGS := -Iinclude @cflags@ $(CFLAGS) -+EXTRA_CXXFLAGS := -Iinclude @cflags@ $(CXXFLAGS) -+EXTRA_LDFLAGS := @ldflags@ $(LDFLAGS) - WERROR := @werror@ - WINRTDEBUG := @winrtdebug@ - CTORSINITARRAY := @ctorsinitarray@ diff --git a/sci-physics/root/files/root-6.02.05-dictpch.patch b/sci-physics/root/files/root-6.02.05-dictpch.patch deleted file mode 100644 index 80a416e1a..000000000 --- a/sci-physics/root/files/root-6.02.05-dictpch.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- etc/dictpch/makepch-gentoo.sh.orig 2015-04-08 14:27:07.781026830 +0300 -+++ etc/dictpch/makepch-gentoo.sh 2015-04-12 13:40:48.226060739 +0300 -@@ -13,8 +13,8 @@ - # Copyright (c) 2014 Rene Brun and Fons Rademakers - # Author: Axel Naumann <axel@cern.ch>, 2014-10-16 - --rootdir=. --cfgdir=etc/dictpch -+rootdir=ROOTDIR_TEMPLATE -+cfgdir=etc/root/dictpch - allheaders=$cfgdir/allHeaders.h - alllinkdefs=$cfgdir/allLinkDefs.h - cppflags=$cfgdir/allCppflags.txt -@@ -36,7 +36,7 @@ - rootbuild=-rootbuild - fi - --cxxflags="-D__CLING__ -D__STDC_LIMIT_MACROS -D__STDC_CONSTANT_MACROS -DROOT_PCH -I$rootdir/include -I$rootdir/etc -I$rootdir/$cfgdir -I$rootdir/etc/cling `cat $rootdir/$cppflags`" -+cxxflags="-D__CLING__ -D__STDC_LIMIT_MACROS -D__STDC_CONSTANT_MACROS -DROOT_PCH -I$rootdir/usr/include/root -I$rootdir/etc/root -I$rootdir/$cfgdir -I$rootdir/etc/root/cling `cat $rootdir/$cppflags`" - - if ! [ "x$1" = "x" ]; then - cxxflags="$cxxflags $1" -@@ -44,7 +44,7 @@ - - # generate pch - touch allDict.cxx.h --$rootdir/bin/rootcling $rootbuild -1 -f allDict.cxx -noDictSelection -c $cxxflags $allheaders $@ $alllinkdefs -+$rootdir/usr/bin/rootcling -1 -f allDict.cxx -noDictSelection -c $cxxflags $allheaders $@ $alllinkdefs - res=$? - if [ $res -eq 0 ] ; then - mv allDict_rdict.pch $pch diff --git a/sci-physics/root/files/root-6.02.05-xrootd4.patch b/sci-physics/root/files/root-6.02.05-xrootd4.patch deleted file mode 100644 index 0b4a4bef0..000000000 --- a/sci-physics/root/files/root-6.02.05-xrootd4.patch +++ /dev/null @@ -1,11 +0,0 @@ -https://sft.its.cern.ch/jira/browse/ROOT-6998 ---- root-6.02.05/net/netxng/src/TNetXNGFile.cxx.orig 2015-02-09 11:59:47.000000000 +0300 -+++ root-6.02.05/net/netxng/src/TNetXNGFile.cxx 2015-04-05 11:32:31.893127758 +0300 -@@ -28,6 +28,7 @@ - #include <XrdCl/XrdClFile.hh> - #include <XrdCl/XrdClXRootDResponses.hh> - #include <XrdCl/XrdClDefaultEnv.hh> -+#include <XrdVersion.hh> - #include <iostream> - - //------------------------------------------------------------------------------ |