[Glibc-bsd-commits] r3621 - in trunk/kfreebsd-9/debian: . patches

[Robert Millan]

Author: rmh
Date: 2011-07-20 18:57:01 +0000 (Wed, 20 Jul 2011)
New Revision: 3621

Modified:
   trunk/kfreebsd-9/debian/changelog
   trunk/kfreebsd-9/debian/patches/003_glibc_dev_aicasm.diff
Log:
003_glibc_dev_aicasm.diff: Add fix for FTBFS on hurd-i386.

Modified: trunk/kfreebsd-9/debian/changelog
===================================================================
--- trunk/kfreebsd-9/debian/changelog	2011-07-20 15:19:32 UTC (rev 3620)
+++ trunk/kfreebsd-9/debian/changelog	2011-07-20 18:57:01 UTC (rev 3621)
@@ -1,3 +1,9 @@
+kfreebsd-9 (9.0~svn224126-2) UNRELEASED; urgency=low
+
+  * 003_glibc_dev_aicasm.diff: Add fix for FTBFS on hurd-i386.
+
+ -- Robert Millan <rmh at debian.org>  Wed, 20 Jul 2011 20:56:09 +0200
+
 kfreebsd-9 (9.0~svn224126-1) experimental; urgency=low
 
   * New upstream snapshot.

Modified: trunk/kfreebsd-9/debian/patches/003_glibc_dev_aicasm.diff
===================================================================
--- trunk/kfreebsd-9/debian/patches/003_glibc_dev_aicasm.diff	2011-07-20 15:19:32 UTC (rev 3620)
+++ trunk/kfreebsd-9/debian/patches/003_glibc_dev_aicasm.diff	2011-07-20 18:57:01 UTC (rev 3621)
@@ -52,3 +52,14 @@
  {
  	struct macro_arg *marg;
  	int retval;
+--- a/sys/dev/aic7xxx/aicasm/aicasm_symbol.c
++++ b/sys/dev/aic7xxx/aicasm/aicasm_symbol.c
+@@ -44,7 +44,7 @@
+ 
+ #include <sys/types.h>
+ #include <sys/param.h>
+-#ifdef BSD
++#if defined(BSD) && !defined(__GNU__)
+ #include <db.h>
+ #else
+ #include <db_185.h>