[Glibc-bsd-commits] r3487 - in trunk/freebsd-buildutils/debian: . patches

[Robert Millan]

Author: rmh
Date: 2011-06-26 15:22:17 +0000 (Sun, 26 Jun 2011)
New Revision: 3487

Modified:
   trunk/freebsd-buildutils/debian/changelog
   trunk/freebsd-buildutils/debian/patches/00_upstream.diff
Log:
  * Disable FreeBSD/pc98 pre-7.0 compatibility on non-FreeBSD (fixes FTBFS on
    hurd-i386).

Modified: trunk/freebsd-buildutils/debian/changelog
===================================================================
--- trunk/freebsd-buildutils/debian/changelog	2011-06-26 15:18:52 UTC (rev 3486)
+++ trunk/freebsd-buildutils/debian/changelog	2011-06-26 15:22:17 UTC (rev 3487)
@@ -6,6 +6,8 @@
     - Bump libbsd-dev Build-Depends to (>= 0.3.0).
     - Add pkg-config to Build-Depends.
     - Remove some now obsolete porting code.
+  * Disable FreeBSD/pc98 pre-7.0 compatibility on non-FreeBSD (fixes FTBFS on
+    hurd-i386).
 
  -- Robert Millan <rmh at debian.org>  Sun, 26 Jun 2011 17:18:27 +0200
 

Modified: trunk/freebsd-buildutils/debian/patches/00_upstream.diff
===================================================================
--- trunk/freebsd-buildutils/debian/patches/00_upstream.diff	2011-06-26 15:18:52 UTC (rev 3486)
+++ trunk/freebsd-buildutils/debian/patches/00_upstream.diff	2011-06-26 15:22:17 UTC (rev 3487)
@@ -1,14 +1,24 @@
 --- a/src/usr.bin/make/main.c
 +++ b/src/usr.bin/make/main.c
-@@ -914,6 +914,7 @@
+@@ -63,7 +63,9 @@
+ 
+ #include <sys/param.h>
+ #include <sys/stat.h>
++#ifdef __FreeBSD__
+ #include <sys/sysctl.h>
++#endif
+ #include <sys/time.h>
+ #include <sys/queue.h>
+ #include <sys/resource.h>
+@@ -914,6 +916,7 @@
  	}
  #endif
  
-+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
++#ifdef __FreeBSD__
  	/*
  	 * Prior to 7.0, FreeBSD/pc98 kernel used to set the
  	 * utsname.machine to "i386", and MACHINE was defined as
-@@ -933,6 +934,7 @@
+@@ -933,6 +936,7 @@
  				machine = "pc98";
  		}
  	}