[SCM] A client for connecting to 3D metaverses such as Linden Labs Secondlife(tm) and OpenSim grids branch, master, updated. upstream/1.21.6-104-g0bdd7ff

[Robin Cornelius]

The following commit has been merged in the master branch:
commit 0bdd7ff62052310c1ac7dc07412a0c0facaf7068
Author: Carlo Wood <carlo at alinoe.com>
Date:   Sun Nov 2 17:17:55 2008 +0000

    Allow-CXXFLAGS-to-specify-the-debug-flag, applying change to upstream via quilt

diff --git a/debian/patches/Allow-CXXFLAGS-to-specify-the-debug-flag.patch b/debian/patches/Allow-CXXFLAGS-to-specify-the-debug-flag.patch
new file mode 100644
index 0000000..2066d61
--- /dev/null
+++ b/debian/patches/Allow-CXXFLAGS-to-specify-the-debug-flag.patch
@@ -0,0 +1,30 @@
+diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake
+index 240853a..7a78be0 100644
+--- a/indra/cmake/00-Common.cmake
++++ b/indra/cmake/00-Common.cmake
+@@ -11,7 +11,7 @@ set(CMAKE_CXX_FLAGS_DEBUG "-D_DEBUG -DLL_DEBUG=1")
+ set(CMAKE_CXX_FLAGS_RELEASE
+     "-DLL_RELEASE=1 -DLL_RELEASE_FOR_DOWNLOAD=1 -DNDEBUG")
+ set(CMAKE_CXX_FLAGS_RELWITHDEBINFO 
+-    "-DLL_RELEASE=1 -DNDEBUG -DLL_RELEASE_WITH_DEBUG_INFO=1")
++    "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -DLL_RELEASE=1 -DNDEBUG -DLL_RELEASE_WITH_DEBUG_INFO=1")
+ 
+ 
+ # Don't bother with a MinSizeRel build.
+@@ -119,7 +119,6 @@ if (LINUX)
+       -fno-math-errno
+       -fno-strict-aliasing
+       -fsigned-char
+-      -g
+       -pthread
+       )
+ 
+@@ -154,7 +153,7 @@ if (LINUX)
+     endif (NOT STANDALONE)
+   endif (VIEWER)
+ 
+-  set(CMAKE_CXX_FLAGS_DEBUG "-fno-inline ${CMAKE_CXX_FLAGS_DEBUG}")
++  set(CMAKE_CXX_FLAGS_DEBUG "-g -fno-inline ${CMAKE_CXX_FLAGS_DEBUG}")
+   set(CMAKE_CXX_FLAGS_RELEASE "-O2 ${CMAKE_CXX_FLAGS_RELEASE}")
+ endif (LINUX)
+ 
diff --git a/debian/patches/series b/debian/patches/series
index fc7cbff..e865b35 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,5 @@
 #linux_joystick.patch
+Allow-CXXFLAGS-to-specify-the-debug-flag.patch
 remove_as_needed.patch
 glh_linear.patch
 viewericon.patch

-- 
A client for connecting to 3D metaverses such as Linden Labs Secondlife(tm) and OpenSim grids