[pkg-boost-commits] r14455 - in boost/trunk/debian: . patches

[Steven Michael Robbins]

Author: smr
Date: 2009-07-03 01:54:13 +0000 (Fri, 03 Jul 2009)
New Revision: 14455

Added:
   boost/trunk/debian/patches/bootstrap.patch
   boost/trunk/debian/patches/wave-cpp.patch
Modified:
   boost/trunk/debian/changelog
   boost/trunk/debian/patches/series
Log:
Add patches to fix build problems.

Modified: boost/trunk/debian/changelog
===================================================================
--- boost/trunk/debian/changelog	2009-07-01 10:20:32 UTC (rev 14454)
+++ boost/trunk/debian/changelog	2009-07-03 01:54:13 UTC (rev 14455)
@@ -6,9 +6,13 @@
     - patches/atomic_count_gcc.patch:
     - patches/library-naming.patch:
     - patches/sp_counted_base.patch: Remove.  Applied upstream.
+  
+  * patches/wave-cpp.patch: New.  Qualify std::string references.
 
- -- Steve M. Robbins <smr at debian.org>  Wed, 01 Jul 2009 02:59:48 -0500
+  * patches/bootstrap.patch: New.  Fix setting for LIBDIR.
 
+ -- Steve M. Robbins <smr at debian.org>  Thu, 02 Jul 2009 20:53:42 -0500
+
 boost1.38 (1.38.0-7) unstable; urgency=low
 
   * control(libboost1.38-dev): downgrade the -doc and all -dev packages to Suggests.

Added: boost/trunk/debian/patches/bootstrap.patch
===================================================================
--- boost/trunk/debian/patches/bootstrap.patch	                        (rev 0)
+++ boost/trunk/debian/patches/bootstrap.patch	2009-07-03 01:54:13 UTC (rev 14455)
@@ -0,0 +1,20 @@
+Date: Mon, 4 May 2009 16:17:46 -0400
+From: "Matthew L. Creech" <mlcreech at gmail.com>
+To: boost at lists.boost.org
+Subject: [boost] [PATCH] Typo in bootstrap.sh
+
+Boost fails to install when LIBDIR isn't specified explicitly and
+isn't "/lib", due to a typo in bootstrap.sh.  Trivial patch below.
+
+
+--- boost_1_39_0.orig/bootstrap.sh
++++ boost_1_39_0/bootstrap.sh
+@@ -249,7 +249,7 @@
+ fi
+ 
+ if test "x$LIBDIR" = x; then
+-  LIBDIR="$EXPREFIX/lib"
++  LIBDIR="$EPREFIX/lib"
+ fi
+ 
+ if test "x$INCLUDEDIR" = x; then

Modified: boost/trunk/debian/patches/series
===================================================================
--- boost/trunk/debian/patches/series	2009-07-01 10:20:32 UTC (rev 14454)
+++ boost/trunk/debian/patches/series	2009-07-03 01:54:13 UTC (rev 14455)
@@ -1,3 +1,4 @@
+bootstrap.patch
 boost-python-examples.patch
 endian.patch
 kfreebsd-jam.patch
@@ -6,3 +7,4 @@
 mpi-python.patch
 jam-wall-clean.patch
 boost_python_translate_exception.patch
+wave-cpp.patch

Added: boost/trunk/debian/patches/wave-cpp.patch
===================================================================
--- boost/trunk/debian/patches/wave-cpp.patch	                        (rev 0)
+++ boost/trunk/debian/patches/wave-cpp.patch	2009-07-03 01:54:13 UTC (rev 14455)
@@ -0,0 +1,20 @@
+--- boost1.39-1.39.0.orig/tools/wave/cpp.cpp
++++ boost1.39-1.39.0/tools/wave/cpp.cpp
+@@ -799,7 +799,7 @@
+ 
+     // add include directories to the system include search paths
+         if (vm.count("sysinclude")) {
+-        vector<std::string> syspaths = vm["sysinclude"].as<vector<string> >();
++	    vector<std::string> syspaths = vm["sysinclude"].as<vector<std::string> >();
+ 
+             vector<std::string>::const_iterator end = syspaths.end();
+             for (vector<std::string>::const_iterator cit = syspaths.begin(); 
+@@ -836,7 +836,7 @@
+     
+     // add additional defined macros 
+         if (vm.count("define")) {
+-            vector<std::string> const &macros = vm["define"].as<vector<string> >();
++            vector<std::string> const &macros = vm["define"].as<vector<std::string> >();
+             vector<std::string>::const_iterator end = macros.end();
+             for (vector<std::string>::const_iterator cit = macros.begin(); 
+                  cit != end; ++cit)