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

[smr at alioth.debian.org]

Author: smr
Date: 2008-08-03 04:32:42 +0000 (Sun, 03 Aug 2008)
New Revision: 14247

Added:
   boost/trunk/debian/patches/avoid-PATH_MAX.patch
Modified:
   boost/trunk/debian/changelog
   boost/trunk/debian/patches/series
Log:
Avoid use of PATH_MAX, which is unavailable on hurd-i386.   Closes: #487343.

Modified: boost/trunk/debian/changelog
===================================================================
--- boost/trunk/debian/changelog	2008-08-03 04:16:41 UTC (rev 14246)
+++ boost/trunk/debian/changelog	2008-08-03 04:32:42 UTC (rev 14247)
@@ -16,6 +16,10 @@
   * debian/patches/kfreebsd-poll-symbols.patch: New.  Work around kFreeBSD
     defining POLL_ERR and POLL_HUP as the same value.  Closes: #492786.
   
+  * debian/patches/avoid-PATH_MAX.patch: New.  Use get_current_dir_name()
+    to avoid static string of size PATH_MAX as that symbol is unavailable
+    in hurd-i386.  Closes: #487343.
+  
   * debian/patches/test-child-exit-t1723.patch: New.  Ignore child process
     if return status is zero (normal); fix for Boost ticket 1723.
   
@@ -26,7 +30,7 @@
   
   * debian/rules: perform parallel builds as per $DEB_BUILD_OPTIONS 
 
- -- Steve M. Robbins <smr at debian.org>  Sat, 02 Aug 2008 23:14:24 -0500
+ -- Steve M. Robbins <smr at debian.org>  Sat, 02 Aug 2008 23:31:51 -0500
 
 boost1.35 (1.35.0-5) unstable; urgency=low
 

Added: boost/trunk/debian/patches/avoid-PATH_MAX.patch
===================================================================
--- boost/trunk/debian/patches/avoid-PATH_MAX.patch	                        (rev 0)
+++ boost/trunk/debian/patches/avoid-PATH_MAX.patch	2008-08-03 04:32:42 UTC (rev 14247)
@@ -0,0 +1,37 @@
+--- boost1.35-1.35.0.orig/tools/jam/src/pwd.c
++++ boost1.35-1.35.0/tools/jam/src/pwd.c
+@@ -24,7 +24,9 @@
+ /* The current directory can't change in bjam, so optimize this to cache
+ ** the result.
+ */
++#ifndef __GLIBC__
+ static char pwd_buffer[PATH_MAX];
++#endif
+ static char * pwd_result = NULL;
+ 
+ 
+@@ -33,11 +35,16 @@
+ {
+     if (!pwd_result)
+     {
++#ifdef __GLIBC__
++        if ((pwd_result = get_current_dir_name()) == NULL)
++#else
+         if (getcwd(pwd_buffer, sizeof(pwd_buffer)) == NULL)
++#endif
+         {
+             perror("can not get current directory");
+             return L0;
+         }
++#ifndef __GLIBC__
+         else
+         {
+ #ifdef NT
+@@ -46,6 +53,7 @@
+             pwd_result = newstr(pwd_buffer);
+ #endif
+         }
++#endif
+     }
+     return list_new(L0, pwd_result);
+ }

Modified: boost/trunk/debian/patches/series
===================================================================
--- boost/trunk/debian/patches/series	2008-08-03 04:16:41 UTC (rev 14246)
+++ boost/trunk/debian/patches/series	2008-08-03 04:32:42 UTC (rev 14247)
@@ -1,3 +1,4 @@
+avoid-PATH_MAX.patch
 python2.5-elementtree.patch
 test-child-exit-t1723.patch
 serialization-intrinsic64.patch