[Glibc-bsd-commits] r2237 - trunk/freebsd-buildutils/debian/patches

[ps-guest at alioth.debian.org]

Author: ps-guest
Date: 2008-07-12 13:19:42 +0000 (Sat, 12 Jul 2008)
New Revision: 2237

Modified:
   trunk/freebsd-buildutils/debian/patches/00_upstream.diff
Log:
* partially refresh 00_upstream.diff for usr.bin/make/main.c



Modified: trunk/freebsd-buildutils/debian/patches/00_upstream.diff
===================================================================
--- trunk/freebsd-buildutils/debian/patches/00_upstream.diff	2008-07-12 12:27:17 UTC (rev 2236)
+++ trunk/freebsd-buildutils/debian/patches/00_upstream.diff	2008-07-12 13:19:42 UTC (rev 2237)
@@ -32,15 +32,15 @@
 diff -ur src.old/usr.bin/make/main.c src/usr.bin/make/main.c
 --- src.old/usr.bin/make/main.c	2005-12-17 12:46:35.000000000 +0100
 +++ src/usr.bin/make/main.c	2006-02-09 19:28:13.000000000 +0100
-@@ -714,6 +714,7 @@
+@@ -930,6 +930,7 @@
  	}
  #endif
  
 +#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
  	/*
- 	 * PC-98 kernel sets the `i386' string to the utsname.machine and
- 	 * it cannot be distinguished from IBM-PC by uname(3).  Therefore,
-@@ -733,6 +734,7 @@
+ 	 * FreeBSD/pc98 kernel used to set the utsname.machine to
+ 	 * "i386", and MACHINE was defined as "i386", so it could
+@@ -950,6 +951,7 @@
  				machine = "pc98";
  		}
  	}