Package: schroot
Version: 1.1.5-1
Severity: serious
Tags: patch

Hi Roger,

schroot FTBFS[1] because of a boost change between single-threaded and
multi-threaded librairies[2].

The attached patch fixes configure.ac to look in the right lib.

[1] 
http://buildd.debian.org/fetch.cgi?pkg=schroot;ver=1.1.5-1%2Bb1;arch=i386;stamp=1187777834
[2] http://teams.debian.net/lurker/message/20070729.230138.170fc848.en.html
-- 
| Lucas Nussbaum
| [EMAIL PROTECTED]   http://www.lucas-nussbaum.net/ |
| jabber: [EMAIL PROTECTED]             GPG: 1024D/023B3F4F |
diff -Nru /tmp/Ko6S6GObsR/schroot-1.1.5/configure /tmp/1eAfeF5jfg/schroot-1.1.5/configure
--- /tmp/Ko6S6GObsR/schroot-1.1.5/configure	2007-07-08 22:03:07.000000000 +0200
+++ /tmp/1eAfeF5jfg/schroot-1.1.5/configure	2007-08-23 13:10:32.000000000 +0200
@@ -23199,10 +23199,10 @@
 
 
 
-{ echo "$as_me:$LINENO: checking for boost::program_options::variables_map in -lboost_program_options-st" >&5
-echo $ECHO_N "checking for boost::program_options::variables_map in -lboost_program_options-st... $ECHO_C" >&6; }
+{ echo "$as_me:$LINENO: checking for boost::program_options::variables_map in -lboost_program_options" >&5
+echo $ECHO_N "checking for boost::program_options::variables_map in -lboost_program_options... $ECHO_C" >&6; }
 saved_ldflags="${LDFLAGS}"
-LDFLAGS="${LDFLAGS} -lboost_program_options-st"
+LDFLAGS="${LDFLAGS} -lboost_program_options"
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -23238,7 +23238,7 @@
        $as_test_x conftest$ac_exeext; then
   { echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6; }
-	        BOOST_LIBS="${BOOST_LIBS} -lboost_program_options-st"
+	        BOOST_LIBS="${BOOST_LIBS} -lboost_program_options"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -23256,10 +23256,10 @@
       conftest$ac_exeext conftest.$ac_ext
 LDFLAGS="${saved_ldflags}"
 
-{ echo "$as_me:$LINENO: checking for boost::program_options::options_description::options() in -lboost_program_options-st" >&5
-echo $ECHO_N "checking for boost::program_options::options_description::options() in -lboost_program_options-st... $ECHO_C" >&6; }
+{ echo "$as_me:$LINENO: checking for boost::program_options::options_description::options() in -lboost_program_options" >&5
+echo $ECHO_N "checking for boost::program_options::options_description::options() in -lboost_program_options... $ECHO_C" >&6; }
 saved_ldflags="${LDFLAGS}"
-LDFLAGS="${LDFLAGS} -lboost_program_options-st"
+LDFLAGS="${LDFLAGS} -lboost_program_options"
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -23319,10 +23319,10 @@
 
 fi
 
-{ echo "$as_me:$LINENO: checking for boost::regex in -lboost_regex-st" >&5
-echo $ECHO_N "checking for boost::regex in -lboost_regex-st... $ECHO_C" >&6; }
+{ echo "$as_me:$LINENO: checking for boost::regex in -lboost_regex" >&5
+echo $ECHO_N "checking for boost::regex in -lboost_regex... $ECHO_C" >&6; }
 saved_ldflags="${LDFLAGS}"
-LDFLAGS="${LDFLAGS} -lboost_regex-st"
+LDFLAGS="${LDFLAGS} -lboost_regex"
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -23358,7 +23358,7 @@
        $as_test_x conftest$ac_exeext; then
   { echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6; }
-	        BOOST_LIBS="${BOOST_LIBS} -lboost_regex-st"
+	        BOOST_LIBS="${BOOST_LIBS} -lboost_regex"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
diff -Nru /tmp/Ko6S6GObsR/schroot-1.1.5/configure.ac /tmp/1eAfeF5jfg/schroot-1.1.5/configure.ac
--- /tmp/Ko6S6GObsR/schroot-1.1.5/configure.ac	2007-07-08 11:30:36.000000000 +0200
+++ /tmp/1eAfeF5jfg/schroot-1.1.5/configure.ac	2007-08-23 13:10:32.000000000 +0200
@@ -230,20 +230,20 @@
              [AC_MSG_FAILURE([liblockdev (lockdev) is not installed, but is required by schroot])])
 AC_SUBST([LOCKDEV_LIBS])
 
-AC_MSG_CHECKING([for boost::program_options::variables_map in -lboost_program_options-st])
+AC_MSG_CHECKING([for boost::program_options::variables_map in -lboost_program_options])
 saved_ldflags="${LDFLAGS}"
-LDFLAGS="${LDFLAGS} -lboost_program_options-st"
+LDFLAGS="${LDFLAGS} -lboost_program_options"
 AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <boost/program_options.hpp>],
                                [boost::program_options::variables_map::variables_map dummy()])],
                [AC_MSG_RESULT([yes])
-	        BOOST_LIBS="${BOOST_LIBS} -lboost_program_options-st"],
+	        BOOST_LIBS="${BOOST_LIBS} -lboost_program_options"],
                [AC_MSG_RESULT([no])
 	        AC_MSG_FAILURE([libboost_program_options (Boost C++ Libraries) is not installed, but is required by schroot])])
 LDFLAGS="${saved_ldflags}"
 
-AC_MSG_CHECKING([for boost::program_options::options_description::options() in -lboost_program_options-st])
+AC_MSG_CHECKING([for boost::program_options::options_description::options() in -lboost_program_options])
 saved_ldflags="${LDFLAGS}"
-LDFLAGS="${LDFLAGS} -lboost_program_options-st"
+LDFLAGS="${LDFLAGS} -lboost_program_options"
 AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <boost/program_options.hpp>],
                                [boost::program_options::options_description testgrp("test group");
                                 bool notused = testgrp.options().empty();
@@ -258,13 +258,13 @@
   AC_DEFINE(BOOST_PROGRAM_OPTIONS_DESCRIPTION_OLD, 1)
 fi
 
-AC_MSG_CHECKING([for boost::regex in -lboost_regex-st])
+AC_MSG_CHECKING([for boost::regex in -lboost_regex])
 saved_ldflags="${LDFLAGS}"
-LDFLAGS="${LDFLAGS} -lboost_regex-st"
+LDFLAGS="${LDFLAGS} -lboost_regex"
 AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <boost/regex.hpp>],
                                [boost::regex("^foo[bar]$")])],
                [AC_MSG_RESULT([yes])
-	        BOOST_LIBS="${BOOST_LIBS} -lboost_regex-st"],
+	        BOOST_LIBS="${BOOST_LIBS} -lboost_regex"],
                [AC_MSG_RESULT([no])
 	        AC_MSG_FAILURE([libboost_regex (Boost C++ Libraries) is not installed, but is required by schroot])])
 LDFLAGS="${saved_ldflags}"
diff -Nru /tmp/Ko6S6GObsR/schroot-1.1.5/debian/changelog /tmp/1eAfeF5jfg/schroot-1.1.5/debian/changelog
--- /tmp/Ko6S6GObsR/schroot-1.1.5/debian/changelog	2007-07-08 21:51:25.000000000 +0200
+++ /tmp/1eAfeF5jfg/schroot-1.1.5/debian/changelog	2007-08-23 13:10:32.000000000 +0200
@@ -1,3 +1,10 @@
+schroot (1.1.5-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Ajusted configure.ac to deal with the boost multi/singlethread switch.
+
+ -- Lucas Nussbaum <[EMAIL PROTECTED]>  Thu, 23 Aug 2007 12:46:22 +0200
+
 schroot (1.1.5-1) unstable; urgency=low
 
   * New upstream development release.
diff -Nru /tmp/Ko6S6GObsR/schroot-1.1.5/scripts/config.guess /tmp/1eAfeF5jfg/schroot-1.1.5/scripts/config.guess
--- /tmp/Ko6S6GObsR/schroot-1.1.5/scripts/config.guess	2007-07-08 22:03:05.000000000 +0200
+++ /tmp/1eAfeF5jfg/schroot-1.1.5/scripts/config.guess	2007-08-23 13:10:32.000000000 +0200
@@ -4,7 +4,7 @@
 #   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
 #   Inc.
 
-timestamp='2007-03-06'
+timestamp='2007-07-22'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -330,7 +330,7 @@
     sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
 	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit ;;
-    i86pc:SunOS:5.*:*)
+    i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
 	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit ;;
     sun4*:SunOS:6*:*)
@@ -793,7 +793,7 @@
 	exit ;;
     *:Interix*:[3456]*)
     	case ${UNAME_MACHINE} in
-	    x86) 
+	    x86)
 		echo i586-pc-interix${UNAME_RELEASE}
 		exit ;;
 	    EM64T | authenticamd)
diff -Nru /tmp/Ko6S6GObsR/schroot-1.1.5/scripts/config.sub /tmp/1eAfeF5jfg/schroot-1.1.5/scripts/config.sub
--- /tmp/Ko6S6GObsR/schroot-1.1.5/scripts/config.sub	2007-07-08 22:03:05.000000000 +0200
+++ /tmp/1eAfeF5jfg/schroot-1.1.5/scripts/config.sub	2007-08-23 13:10:32.000000000 +0200
@@ -4,7 +4,7 @@
 #   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
 #   Inc.
 
-timestamp='2007-01-18'
+timestamp='2007-06-28'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -475,8 +475,8 @@
 		basic_machine=craynv-cray
 		os=-unicosmp
 		;;
-	cr16c)
-		basic_machine=cr16c-unknown
+	cr16)
+		basic_machine=cr16-unknown
 		os=-elf
 		;;
 	crds | unos)
@@ -683,6 +683,10 @@
 		basic_machine=i386-pc
 		os=-mingw32
 		;;
+	mingw32ce)
+		basic_machine=arm-unknown
+		os=-mingw32ce
+		;;
 	miniframe)
 		basic_machine=m68000-convergent
 		;;

Reply via email to