[SCM] root-system: CERN's ROOT Data Analysis Framework branch, master, updated. upstream/5.34.00_rc1-28-g2ca593b

[Lifeng Sun]

The following commit has been merged in the master branch:
commit cd797bc1f6080a41e6925a40c2e3ad2827642c96
Author: Lifeng Sun <lifongsun at gmail.com>
Date:   Tue Jun 19 14:01:31 2012 +0800

    74-kfreebsd.patch: fix c++11 flag.

diff --git a/debian/patches/74-kfreebsd.patch b/debian/patches/74-kfreebsd.patch
index d645e29..c6461aa 100644
--- a/debian/patches/74-kfreebsd.patch
+++ b/debian/patches/74-kfreebsd.patch
@@ -18,18 +18,18 @@
 +NOOPT         =
 +endif
 +
-+ifeq (c++11,$(findstring c++11,$(ROOTBUILD)))
-+CXX11         = -std=c++11
++ifeq ($(CXX11),yes)
++CXX11FLAGS    = -std=c++11 -Wno-deprecated-declarations
 +endif
 +
 +# Compiler:
 +CXX           = g++
 +CC            = gcc
 +CXXFLAGS      = -pipe -m32 -Wall -W -Woverloaded-virtual \
-+                -fPIC $(EXTRA_CXXFLAGS) $(CXX11)
++                -fPIC $(EXTRA_CXXFLAGS) $(CXX11FLAGS)
 +CFLAGS        = -pipe -m32 -Wall -W -fPIC $(EXTRA_CFLAGS)
 +CINTCXXFLAGS  = -pipe -m32 -Wall -W -Woverloaded-virtual \
-+                -fPIC $(EXTRA_CXXFLAGS) $(CXX11) \
++                -fPIC $(EXTRA_CXXFLAGS) $(CXX11FLAGS) \
 +                -DG__REGEXP -DG__UNIX -DG__SHAREDLIB \
 +                -DG__OSFDLL -DG__ROOT -DG__REDIRECTIO \
 +                -DG__STD_EXCEPTION
@@ -101,18 +101,18 @@
 +NOOPT         =
 +endif
 +
-+ifeq (c++11,$(findstring c++11,$(ROOTBUILD)))
-+CXX11         = -std=c++11
++ifeq ($(CXX11),yes)
++CXX11FLAGS    = -std=c++11 -Wno-deprecated-declarations
 +endif
 +
 +# Compiler:
 +CXX           = g++
 +CC            = gcc
 +CXXFLAGS      = -pipe -m64 -Wshadow -Wall -W -Woverloaded-virtual \
-+                -fPIC $(EXTRA_CXXFLAGS) $(CXX11)
++                -fPIC $(EXTRA_CXXFLAGS) $(CXX11FLAGS)
 +CFLAGS        = -pipe -m64 -Wshadow -Wall -W -fPIC $(EXTRA_CFLAGS)
 +CINTCXXFLAGS  = -pipe -m64 -Wall -W -Woverloaded-virtual \
-+                -fPIC $(EXTRA_CXXFLAGS) $(CXX11) \
++                -fPIC $(EXTRA_CXXFLAGS) $(CXX11FLAGS) \
 +                -DG__REGEXP -DG__UNIX -DG__SHAREDLIB \
 +                -DG__OSFDLL -DG__ROOT -DG__REDIRECTIO \
 +                -DG__STD_EXCEPTION -DG__64BIT
@@ -220,7 +220,7 @@
     auxcflags=
 --- a/configure
 +++ b/configure
-@@ -1169,6 +1169,8 @@
+@@ -1213,6 +1213,8 @@
          freebsd*:*:5*)         arch=freebsd5        ;;
          freebsd*:*:4*)         arch=freebsd4        ;;
          freebsd*:*:*)          arch=freebsd         ;;
@@ -229,7 +229,7 @@
          hp-ux:ia64:*)          arch=hpuxia64acc     ;;
          hp-ux:*:*)             arch=hpuxacc         ;;
          hurd*:*:*)             arch=hurddeb         ;;
-@@ -1764,7 +1766,7 @@
+@@ -1809,7 +1811,7 @@
     fi
  fi
  
@@ -238,7 +238,7 @@
      linuxdist=
      if `$cwhich lsb_release > /dev/null 2>&1` ; then
         if lsb_release -d | grep -i 'ubuntu' > /dev/null 2>& 1; then
-@@ -3838,7 +3840,7 @@
+@@ -3905,7 +3907,7 @@
  #
  bonjourcppflags=
  case $platform in
@@ -247,7 +247,7 @@
          ;;
      *)
          if test "x$enable_bonjour" = "xyes" ; then
-@@ -5863,7 +5865,7 @@
+@@ -5930,7 +5932,7 @@
  message "Checking whether to build libMemStat"
  if test "x$enable_memstat" = "xyes" || test ! "x$MEMSTAT" = "x"; then
      case $arch in

-- 
root-system: CERN's ROOT Data Analysis Framework