summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Callen <abcd@gentoo.org>2011-01-23 20:18:17 +0000
committerJonathan Callen <abcd@gentoo.org>2011-01-23 20:18:17 +0000
commit9478d03acdc733be93a6de05df1739c56cb1e632 (patch)
tree76e4a0b1cad71643d1a801ea53a3eb1e61258696 /dev-util/schroot/files
parentChange suggested key binding for emacs users, bug #352063. (diff)
downloadgentoo-2-9478d03acdc733be93a6de05df1739c56cb1e632.tar.gz
gentoo-2-9478d03acdc733be93a6de05df1739c56cb1e632.tar.bz2
gentoo-2-9478d03acdc733be93a6de05df1739c56cb1e632.zip
Add patch to fix build with USE=debug. Debian bug 609067, Gentoo bug 344615
(Portage version: 2.2.0_alpha14_p1/cvs/Linux i686)
Diffstat (limited to 'dev-util/schroot/files')
-rw-r--r--dev-util/schroot/files/schroot-1.4.14-debug.patch28
1 files changed, 28 insertions, 0 deletions
diff --git a/dev-util/schroot/files/schroot-1.4.14-debug.patch b/dev-util/schroot/files/schroot-1.4.14-debug.patch
new file mode 100644
index 000000000000..4b5b954e1bc0
--- /dev/null
+++ b/dev-util/schroot/files/schroot-1.4.14-debug.patch
@@ -0,0 +1,28 @@
+From 741833bdcba4b9aa7e389d389f42e4fa504d7cc7 Mon Sep 17 00:00:00 2001
+From: Jonathan Callen <abcd@gentoo.org>
+Date: Wed, 5 Jan 2011 01:26:26 -0500
+Subject: [PATCH] schroot-base: fix build with --enable-debug
+
+Rename last instance of the variable sbuild::debug_level to
+sbuild::debug_log_level. This appears to have been missed in commit
+04c19bb6c28295a387e60066c48db7f443e5b925.
+---
+ bin/schroot-base/schroot-base-main.cc | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/bin/schroot-base/schroot-base-main.cc b/bin/schroot-base/schroot-base-main.cc
+index ac86018..d6cd0b0 100644
+--- a/bin/schroot-base/schroot-base-main.cc
++++ b/bin/schroot-base/schroot-base-main.cc
+@@ -106,7 +106,7 @@ main::run (int argc,
+ this->program_options->parse(argc, argv);
+
+ #ifdef SBUILD_DEBUG
+- sbuild::debug_level = sbuild::DEBUG_CRITICAL;
++ sbuild::debug_log_level = sbuild::DEBUG_CRITICAL;
+ #endif
+
+ if (this->use_syslog)
+--
+1.7.3.3
+