[Glibc-bsd-commits] r3627 - in trunk/kfreebsd-8/debian: . patches

[Robert Millan]

Author: rmh
Date: 2011-07-25 12:51:04 +0000 (Mon, 25 Jul 2011)
New Revision: 3627

Modified:
   trunk/kfreebsd-8/debian/changelog
   trunk/kfreebsd-8/debian/patches/003_glibc_dev_aicasm.diff
   trunk/kfreebsd-8/debian/patches/008_config.diff
Log:
Fix more FTBFS problems on hurd-i386

Modified: trunk/kfreebsd-8/debian/changelog
===================================================================
--- trunk/kfreebsd-8/debian/changelog	2011-07-23 17:28:09 UTC (rev 3626)
+++ trunk/kfreebsd-8/debian/changelog	2011-07-25 12:51:04 UTC (rev 3627)
@@ -2,7 +2,7 @@
 
   * Replace msk backport patch with version from 8-STABLE (instead of
     9-CURRRENT).
-  * Fix another FTBFS on hurd-i386 (bogus use of linux macro in aicasm).
+  * Fix a pair of FTBFS on hurd-i386.
   * Provide "kfreebsd-headers" virtual package in kfreebsd-headers-
     @version at -@abiname at -@flavor at .
 

Modified: trunk/kfreebsd-8/debian/patches/003_glibc_dev_aicasm.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/003_glibc_dev_aicasm.diff	2011-07-23 17:28:09 UTC (rev 3626)
+++ trunk/kfreebsd-8/debian/patches/003_glibc_dev_aicasm.diff	2011-07-25 12:51:04 UTC (rev 3627)
@@ -126,7 +126,7 @@
 -#ifdef __linux__
 -#include "aicdb.h"
 +#include <sys/param.h>		/* BSD */
-+#ifdef BSD
++#ifdef __FreeBSD__
 +#include <db.h>			/* BSD native libdb */
  #else
 -#include <db.h>

Modified: trunk/kfreebsd-8/debian/patches/008_config.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/008_config.diff	2011-07-23 17:28:09 UTC (rev 3626)
+++ trunk/kfreebsd-8/debian/patches/008_config.diff	2011-07-25 12:51:04 UTC (rev 3627)
@@ -33,9 +33,9 @@
  #include <sys/file.h>
  #include <sys/mman.h>
 -#include <sys/param.h>
-+#include <sys/param.h> /* BSD */
++#include <sys/param.h>
 +
-+#ifndef BSD
++#ifndef __FreeBSD__
 +#include <bsd/string.h> /* strlcpy, strlcat */
 +#endif