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

[Robert Millan]

Author: rmh
Date: 2011-07-11 16:16:04 +0000 (Mon, 11 Jul 2011)
New Revision: 3568

Modified:
   trunk/kfreebsd-8/debian/changelog
   trunk/kfreebsd-8/debian/patches/003_glibc_dev_aicasm.diff
Log:
Fix another FTBFS on hurd-i386 (bogus use of linux macro in aicasm).

Modified: trunk/kfreebsd-8/debian/changelog
===================================================================
--- trunk/kfreebsd-8/debian/changelog	2011-07-11 15:46:49 UTC (rev 3567)
+++ trunk/kfreebsd-8/debian/changelog	2011-07-11 16:16:04 UTC (rev 3568)
@@ -1,9 +1,10 @@
 kfreebsd-8 (8.2-7) UNRELEASED; urgency=low
 
-  * Replace msk backport patch with version from 8-STABLE (instead of 9-
-    CURRRENT).
+  * 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).
 
- -- Robert Millan <rmh at debian.org>  Mon, 11 Jul 2011 17:31:31 +0200
+ -- Robert Millan <rmh at debian.org>  Mon, 11 Jul 2011 18:15:44 +0200
 
 kfreebsd-8 (8.2-6) unstable; urgency=low
 

Modified: trunk/kfreebsd-8/debian/patches/003_glibc_dev_aicasm.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/003_glibc_dev_aicasm.diff	2011-07-11 15:46:49 UTC (rev 3567)
+++ trunk/kfreebsd-8/debian/patches/003_glibc_dev_aicasm.diff	2011-07-11 16:16:04 UTC (rev 3568)
@@ -11,7 +11,7 @@
 
 --- a/sys/dev/aic7xxx/aicasm/Makefile
 +++ b/sys/dev/aic7xxx/aicasm/Makefile
-@@ -14,8 +14,9 @@ GENHDRS=	aicasm_gram.h aicasm_macro_gram
+@@ -14,8 +14,9 @@
  SRCS=	${GENHDRS} ${CSRCS} ${YSRCS} ${LSRCS}
  CLEANFILES+= ${GENHDRS} ${YSRCS:R:C/(.*)/\1.output/g}
  DPADD=	${LIBL}
@@ -22,7 +22,7 @@
  
  # Correct path for kernel builds
  # Don't rely on the kernel's .depend file
-@@ -24,13 +25,6 @@ WARNS?=	6
+@@ -24,13 +25,6 @@
  DEPENDFILE=	.depend_aicasm
  .endif
  
@@ -64,7 +64,7 @@
  #else
  #include <sys/queue.h>
  #endif
-@@ -1534,7 +1535,7 @@ initialize_symbol(symbol_t *symbol)
+@@ -1534,7 +1535,7 @@
  }
  
  static void
@@ -148,3 +148,14 @@
  #else
  #include <sys/queue.h>
  #endif
+--- a/sys/dev/aic7xxx/aicasm/aicasm.c
++++ b/sys/dev/aic7xxx/aicasm/aicasm.c
+@@ -53,7 +53,7 @@
+ #include <sysexits.h>
+ #include <unistd.h>
+ 
+-#if linux
++#ifdef __GLIBC__
+ #include <endian.h>
+ #else
+ #include <machine/endian.h>