Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Eric Sandall (fb88ed8d0ee34d571992da218ef5ec3ee4a13d09)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Eric Sandall <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Eric Sandall (fb88ed8d0ee34d571992da218ef5ec3ee4a13d09)
  • Date: Sat, 12 Apr 2008 22:56:24 -0500

GIT changes to master grimoire by Eric Sandall <sandalle AT sourcemage.org>:

utils/schroot/HISTORY | 4 +
utils/schroot/INSTALL | 3 +
utils/schroot/PRE_BUILD | 8 ++-
utils/schroot/locale.patch | 91
+++++++++++++++++++++++++++++++++++++++
utils/schroot/schroot.conf.patch | 19 ++++++++
5 files changed, 122 insertions(+), 3 deletions(-)

New commits:
commit fb88ed8d0ee34d571992da218ef5ec3ee4a13d09
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

schroot: Use install_config_file to avoid overwriting schroot.conf (and
patch Makefiles to not automatically install schroot.conf)

commit 853af940f5c0cd89817a8955a78c6827f9753a25
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

schroot: Upstream patch to cope with an invalid locale

diff --git a/utils/schroot/HISTORY b/utils/schroot/HISTORY
index 3490cbc..60d2370 100644
--- a/utils/schroot/HISTORY
+++ b/utils/schroot/HISTORY
@@ -1,4 +1,8 @@
2008-04-12 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS, DEPENDS, PRE_BUILD: Created
+ * INSTALL: Use install_config_file for schroot.conf
* gcc43.patch: Fix gcc 4.3.0 strictness
+ * locale.patch: Cope with invalid locale. From:
+
http://lists.alioth.debian.org/pipermail/buildd-tools-devel/2007-May/001625.html
+ * schroot.conf.patch: Do not automatically (thus overwriting)
schroot.conf

diff --git a/utils/schroot/INSTALL b/utils/schroot/INSTALL
new file mode 100755
index 0000000..e4360b4
--- /dev/null
+++ b/utils/schroot/INSTALL
@@ -0,0 +1,3 @@
+default_install &&
+install_config_file $SOURCE_DIRECTORY/bin/schroot/schroot.conf \
+ $INSTALL_ROOT/etc/schroot/schroot.conf
diff --git a/utils/schroot/PRE_BUILD b/utils/schroot/PRE_BUILD
index 7528467..7150588 100755
--- a/utils/schroot/PRE_BUILD
+++ b/utils/schroot/PRE_BUILD
@@ -1,3 +1,5 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-patch -p1 < $SCRIPT_DIRECTORY/gcc43.patch
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+patch -p1 < $SCRIPT_DIRECTORY/gcc43.patch &&
+patch -p0 < $SCRIPT_DIRECTORY/locale.patch &&
+patch -p1 < $SCRIPT_DIRECTORY/schroot.conf.patch
diff --git a/utils/schroot/locale.patch b/utils/schroot/locale.patch
new file mode 100644
index 0000000..fde07a9
--- /dev/null
+++ b/utils/schroot/locale.patch
@@ -0,0 +1,91 @@
+#
+# From
http://lists.alioth.debian.org/pipermail/buildd-tools-devel/2007-May/001625.html
+#
+Index: sbuild/sbuild-basic-keyfile.tcc
+===================================================================
+--- sbuild/sbuild-basic-keyfile.tcc (revision 1173)
++++ sbuild/sbuild-basic-keyfile.tcc (working copy)
+@@ -179,7 +179,15 @@
+ key_type const& key,
+ std::string&
value) const
+ {
+- std::string localename = std::locale("").name();
++ std::string localename;
++ try
++ {
++ localename = std::locale("").name();
++ }
++ catch (std::runtime_error const& e) // Invalid locale
++ {
++ localename = std::locale::classic();
++ }
+ std::string::size_type pos;
+ bool status = false;
+
+Index: configure.ac
+===================================================================
+--- configure.ac (revision 1173)
++++ configure.ac (working copy)
+@@ -222,20 +222,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])
++AC_MSG_CHECKING([for boost::program_options::variables_map in
-lboost_program_options-st])
+ saved_ldflags="${LDFLAGS}"
+-LDFLAGS="${LDFLAGS} -lboost_program_options"
++LDFLAGS="${LDFLAGS} -lboost_program_options-st"
+ 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"],
++ BOOST_LIBS="${BOOST_LIBS} -lboost_program_options-st"],
+ [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])
++AC_MSG_CHECKING([for boost::program_options::options_description::options()
in -lboost_program_options-st])
+ saved_ldflags="${LDFLAGS}"
+-LDFLAGS="${LDFLAGS} -lboost_program_options"
++LDFLAGS="${LDFLAGS} -lboost_program_options-st"
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <boost/program_options.hpp>],
+ [boost::program_options::options_description
testgrp("test group");
+ bool notused = testgrp.options().empty();
+@@ -250,13 +250,13 @@
+ AC_DEFINE(BOOST_PROGRAM_OPTIONS_DESCRIPTION_OLD, 1)
+ fi
+
+-AC_MSG_CHECKING([for boost::regex in -lboost_regex])
++AC_MSG_CHECKING([for boost::regex in -lboost_regex-st])
+ saved_ldflags="${LDFLAGS}"
+-LDFLAGS="${LDFLAGS} -lboost_regex"
++LDFLAGS="${LDFLAGS} -lboost_regex-st"
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <boost/regex.hpp>],
+ [boost::regex("^foo[bar]$")])],
+ [AC_MSG_RESULT([yes])
+- BOOST_LIBS="${BOOST_LIBS} -lboost_regex"],
++ BOOST_LIBS="${BOOST_LIBS} -lboost_regex-st"],
+ [AC_MSG_RESULT([no])
+ AC_MSG_FAILURE([libboost_regex (Boost C++ Libraries) is not
installed, but is required by schroot])])
+ LDFLAGS="${saved_ldflags}"
+Index: bin/schroot-base/schroot-base-run.h
+===================================================================
+--- bin/schroot-base/schroot-base-run.h (revision 1173)
++++ bin/schroot-base/schroot-base-run.h (working copy)
+@@ -51,7 +51,14 @@
+ try
+ {
+ // Set up locale.
+- std::locale::global(std::locale(""));
++ try
++ {
++ std::locale::global(std::locale(""));
++ }
++ catch (std::runtime_error const& e) // Invalid locale
++ {
++ std::locale::global(std::locale::classic());
++ }
+ std::cout.imbue(std::locale());
+ std::cerr.imbue(std::locale());
+
diff --git a/utils/schroot/schroot.conf.patch
b/utils/schroot/schroot.conf.patch
new file mode 100644
index 0000000..0860cd3
--- /dev/null
+++ b/utils/schroot/schroot.conf.patch
@@ -0,0 +1,19 @@
+diff -Naur schroot-1.1.2.orig/bin/schroot/Makefile.in
schroot-1.1.2/bin/schroot/Makefile.in
+--- schroot-1.1.2.orig/bin/schroot/Makefile.in 2008-04-12 20:43:09.532220489
-0700
++++ schroot-1.1.2/bin/schroot/Makefile.in 2008-04-12 20:47:19.966471871
-0700
+@@ -556,15 +556,6 @@
+ echo " rm -f '$(DESTDIR)$(man5dir)/$$inst'"; \
+ rm -f "$(DESTDIR)$(man5dir)/$$inst"; \
+ done
+-install-pkgsysconfDATA: $(pkgsysconf_DATA)
+- @$(NORMAL_INSTALL)
+- test -z "$(pkgsysconfdir)" || $(mkdir_p) "$(DESTDIR)$(pkgsysconfdir)"
+- @list='$(pkgsysconf_DATA)'; for p in $$list; do \
+- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
+- echo " $(pkgsysconfDATA_INSTALL) '$$d$$p'
'$(DESTDIR)$(pkgsysconfdir)/$$f'"; \
+- $(pkgsysconfDATA_INSTALL) "$$d$$p"
"$(DESTDIR)$(pkgsysconfdir)/$$f"; \
+- done
+
+ uninstall-pkgsysconfDATA:
+ @$(NORMAL_UNINSTALL)



  • [SM-Commit] GIT changes to master grimoire by Eric Sandall (fb88ed8d0ee34d571992da218ef5ec3ee4a13d09), Eric Sandall, 04/12/2008

Archive powered by MHonArc 2.6.24.

Top of Page