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

[Guillem Jover]

Author: guillem
Date: 2011-05-29 18:04:07 +0000 (Sun, 29 May 2011)
New Revision: 3341

Modified:
   trunk/freebsd-buildutils/debian/changelog
   trunk/freebsd-buildutils/debian/patches/10_non_kfreebsd.diff
Log:
Only use MACHINE_ARCH in freebsd-make if it's defined.


Modified: trunk/freebsd-buildutils/debian/changelog
===================================================================
--- trunk/freebsd-buildutils/debian/changelog	2011-05-29 18:01:20 UTC (rev 3340)
+++ trunk/freebsd-buildutils/debian/changelog	2011-05-29 18:04:07 UTC (rev 3341)
@@ -16,6 +16,7 @@
     and use it as pmake instead of using it from the pmake package.
   * Switch to debhelper compatibility level 7.
     - Use dh_prep instead of “dh_clean -k”.
+  * Only use MACHINE_ARCH in freebsd-make if it's defined.
 
  -- Robert Millan <rmh at debian.org>  Thu, 13 Jan 2011 18:29:12 +0100
 

Modified: trunk/freebsd-buildutils/debian/patches/10_non_kfreebsd.diff
===================================================================
--- trunk/freebsd-buildutils/debian/patches/10_non_kfreebsd.diff	2011-05-29 18:01:20 UTC (rev 3340)
+++ trunk/freebsd-buildutils/debian/patches/10_non_kfreebsd.diff	2011-05-29 18:04:07 UTC (rev 3341)
@@ -1,10 +1,10 @@
 ---
- src/usr.bin/make/main.c |    6 +-----
- 1 file changed, 1 insertion(+), 5 deletions(-)
+ src/usr.bin/make/main.c |   10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
 
 --- a/src/usr.bin/make/main.c
 +++ b/src/usr.bin/make/main.c
-@@ -949,11 +949,7 @@ main(int argc, char **argv)
+@@ -949,11 +949,11 @@ main(int argc, char **argv)
  	 * run-time.
  	 */
  	if (machine == NULL) {
@@ -13,7 +13,11 @@
 -		if (uname(&utsname) == -1)
 -			err(2, "uname");
 -		machine = utsname.machine;
++#ifdef MACHINE_ARCH
 +		machine = MACHINE_ARCH;
++#else
++		machine = "unknown";
++#endif
  	}
  
  	if ((machine_arch = getenv("MACHINE_ARCH")) == NULL) {