Attachment 1084 Details for Bug 1393 – kdebase 3.5.13.2: add cmake option WITH_KDESKTOP_LOCK_BACKTRACE

By default, Bugzilla does not search the list of RESOLVED bugs.
You can force it to do so by putting the upper-case word ALL in front of your search query, e.g.: ALL tdelibs
We recommend searching for bugs this way, as you may discover that your bug has already been resolved and fixed in a later release.

[patch] kdebase 3.5.13.2: add cmake option WITH_KDESKTOP_LOCK_BACKTRACE

kdebase-kdesktop-lock-backtrace.diff (text/plain), 2.62 KB, created by Slávek Banko on 2013-01-24 21:08:15 CST

(hide)

Description:

Filename:

MIME Type:

Creator: Slávek Banko

Created: 2013-01-24 21:08:15 CST

Size: 2.62 KB

patch

obsolete

>diff --git a/CMakeLists.txt b/CMakeLists.txt
>index 473c37c..019aef0 100644
>--- a/CMakeLists.txt
>+++ b/CMakeLists.txt
>@@ -22,6 +22,7 @@
> 
> include( FindPkgConfig )
> include( CheckIncludeFile )
>+include( CheckIncludeFiles )
> include( CheckCSourceRuns )
> include( CheckCXXSourceCompiles )
> include( CheckLibraryExists )
>@@ -79,6 +79,7 @@
> option( WITH_ARTS "Enable aRts support" OFF )
> option( WITH_I8K "Enable Dell laptop support (ksysguard)" OFF )
> option( WITH_HAL "Enable HAL support" OFF )
>+option( WITH_KDESKTOP_LOCK_BACKTRACE "Enable backtrace in kdesktop_lock exception handler"  OFF )
> 
> 
> ##### user requested modules ####################
>diff --git a/config.h.cmake b/config.h.cmake
>index b543328..8e88fd1 100644
>--- a/config.h.cmake
>+++ b/config.h.cmake
>@@ -121,6 +121,7 @@
> 
> // kdesktop
> #cmakedefine KSCREENSAVER_PAM_SERVICE "@KSCREENSAVER_PAM_SERVICE@"
>+#cmakedefine WITH_KDESKTOP_LOCK_BACKTRACE 1
> 
> // kdm
> #cmakedefine XBINDIR "@XBINDIR@"
>diff --git a/kdesktop/ConfigureChecks.cmake b/kdesktop/ConfigureChecks.cmake
>index da78021..f8fde87 100644
>--- a/kdesktop/ConfigureChecks.cmake
>+++ b/kdesktop/ConfigureChecks.cmake
>@@ -14,3 +14,10 @@
> if( WITH_PAM AND (NOT DEFINED KSCREENSAVER_PAM_SERVICE) )
>   set( KSCREENSAVER_PAM_SERVICE "kde" CACHE INTERNAL "" )
> endif( )
>+
>+if( WITH_KDESKTOP_LOCK_BACKTRACE )
>+  check_include_files( "bfd.h;demangle.h;libiberty.h" HAVE_BINUTILS_DEV )
>+  if( NOT HAVE_BINUTILS_DEV )
>+    tde_message_fatal( "backtrace in kdesktop_lock exception handler require binutils-dev, but not found on your system" )
>+  endif( )
>+endif( )
>diff --git a/kdesktop/lock/backtrace_symbols.c b/kdesktop/lock/backtrace_symbols.c
>index 69aa2d7..09a7665 100644
>--- a/kdesktop/lock/backtrace_symbols.c
>+++ b/kdesktop/lock/backtrace_symbols.c
>@@ -35,6 +35,10 @@
>    along with this program; if not, write to the Free Software
>    Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
> 
>+#include <config.h>
>+
>+#ifdef WITH_KDESKTOP_LOCK_BACKTRACE
>+
> #define fatal(a, b) exit(1)
> #define bfd_fatal(a) exit(1)
> #define bfd_nonfatal(a) exit(1)
>@@ -323,3 +327,4 @@ backtrace_symbols_fd(void *const *buffer, int size, int fd)
>         free(strings);
> }
> 
>+#endif /* WITH_KDESKTOP_LOCK_BACKTRACE */
>diff --git a/kdesktop/lock/lockprocess.cc b/kdesktop/lock/lockprocess.cc
>index a3f5fb5..5f01274 100644
>--- a/kdesktop/lock/lockprocess.cc
>+++ b/kdesktop/lock/lockprocess.cc
>@@ -137,6 +137,7 @@ static Atom   gXA_SCREENSAVER_VERSION;
> 
> void print_trace()
> {
>+#ifdef WITH_KDESKTOP_LOCK_BACKTRACE
> 	void *array[10];
> 	size_t size;
> 	char **strings;
>@@ -152,6 +153,7 @@ void print_trace()
> 	}
> 
> 	free (strings);
>+#endif
> }
> 
> static void segv_handler(int)

Actions: View | Diff

Attachments on bug 1393: 1078 | 1079 | 1080 | 1081 | 1082 | 1083 | 1084 | 1085 | 1087 | 1088 | 1089 | 1091 | 1092 | 1093 | 1094 | 1095 | 1096 | 1099 | 1103 | 1226 | 1294 | 1295 | 1296 | 1297 | 1298 | 1299 | 1300 | 1301 | 1302 | 1303 | 1309