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

[Robert Millan]

Author: rmh
Date: 2011-01-13 17:30:01 +0000 (Thu, 13 Jan 2011)
New Revision: 3235

Added:
   trunk/freebsd-buildutils/debian/patches/10_non_kfreebsd.diff
Modified:
   trunk/freebsd-buildutils/debian/changelog
   trunk/freebsd-buildutils/debian/patches/series
Log:
  * 10_non_kfreebsd.diff: Make freebsd-make usable on non-kFreeBSD
    systems.  (Closes: #602768)


Modified: trunk/freebsd-buildutils/debian/changelog
===================================================================
--- trunk/freebsd-buildutils/debian/changelog	2011-01-13 17:25:10 UTC (rev 3234)
+++ trunk/freebsd-buildutils/debian/changelog	2011-01-13 17:30:01 UTC (rev 3235)
@@ -1,3 +1,10 @@
+freebsd-buildutils (8.1-2) UNRELEASED; urgency=low
+
+  * 10_non_kfreebsd.diff: Make freebsd-make usable on non-kFreeBSD
+    systems.  (Closes: #602768)
+
+ -- Robert Millan <rmh at debian.org>  Thu, 13 Jan 2011 18:29:12 +0100
+
 freebsd-buildutils (8.1-1) unstable; urgency=low
 
   [ Petr Salinger ]

Added: trunk/freebsd-buildutils/debian/patches/10_non_kfreebsd.diff
===================================================================
--- trunk/freebsd-buildutils/debian/patches/10_non_kfreebsd.diff	                        (rev 0)
+++ trunk/freebsd-buildutils/debian/patches/10_non_kfreebsd.diff	2011-01-13 17:30:01 UTC (rev 3235)
@@ -0,0 +1,15 @@
+--- a/src/usr.bin/make/main.c
++++ b/src/usr.bin/make/main.c
+@@ -943,11 +943,7 @@
+ 	 * run-time.
+ 	 */
+ 	if (machine == NULL) {
+-		static struct utsname utsname;
+-
+-		if (uname(&utsname) == -1)
+-			err(2, "uname");
+-		machine = utsname.machine;
++		machine = MACHINE_ARCH;
+ 	}
+ 
+ 	if ((machine_arch = getenv("MACHINE_ARCH")) == NULL) {

Modified: trunk/freebsd-buildutils/debian/patches/series
===================================================================
--- trunk/freebsd-buildutils/debian/patches/series	2011-01-13 17:25:10 UTC (rev 3234)
+++ trunk/freebsd-buildutils/debian/patches/series	2011-01-13 17:30:01 UTC (rev 3235)
@@ -7,6 +7,7 @@
 07_brandelf.diff
 08_maxpathlen.diff
 09_ports_path.diff
+10_non_kfreebsd.diff
 11_optreset.diff
 14_config.diff
 15_manpages_gzip.diff