Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/evbppc Use nbstat when cross-compiling, unbreaks bu...



details:   https://anonhg.NetBSD.org/src/rev/4d2dc5219581
branches:  trunk
changeset: 327278:4d2dc5219581
user:      joerg <joerg%NetBSD.org@localhost>
date:      Mon Mar 03 18:25:14 2014 +0000

description:
Use nbstat when cross-compiling, unbreaks build on Linux.

diffstat:

 sys/arch/evbppc/compile/walnut-mkimg.sh   |   5 +++--
 sys/arch/evbppc/conf/Makefile.ev64260.inc |   6 +++---
 sys/arch/evbppc/conf/Makefile.obs405.inc  |  10 +++++-----
 sys/arch/evbppc/conf/Makefile.walnut.inc  |   6 +++---
 4 files changed, 14 insertions(+), 13 deletions(-)

diffs (92 lines):

diff -r e0b382801d1d -r 4d2dc5219581 sys/arch/evbppc/compile/walnut-mkimg.sh
--- a/sys/arch/evbppc/compile/walnut-mkimg.sh   Mon Mar 03 18:21:33 2014 +0000
+++ b/sys/arch/evbppc/compile/walnut-mkimg.sh   Mon Mar 03 18:25:14 2014 +0000
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $NetBSD: walnut-mkimg.sh,v 1.4 2010/11/06 16:23:35 uebayasi Exp $
+# $NetBSD: walnut-mkimg.sh,v 1.5 2014/03/03 18:25:14 joerg Exp $
 
 # Convert an input to a TFTP image loadable by the IBM PowerPC OpenBIOS.
 
@@ -18,6 +18,7 @@
 
 : ${OBJDUMP=objdump}
 : ${OBJCOPY=objcopy}
+: ${STAT=stat}
 
 file=$( file $input )
 case $file in
@@ -36,7 +37,7 @@
        ;;
 esac
 
-size=`stat -f '%z' ${input}.bin.$$`
+size=$(${STAT} -f '%z' ${input}.bin.$$)
 size=$(( ( $size + 511 ) / 512 ))
 
 enc()
diff -r e0b382801d1d -r 4d2dc5219581 sys/arch/evbppc/conf/Makefile.ev64260.inc
--- a/sys/arch/evbppc/conf/Makefile.ev64260.inc Mon Mar 03 18:21:33 2014 +0000
+++ b/sys/arch/evbppc/conf/Makefile.ev64260.inc Mon Mar 03 18:25:14 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.ev64260.inc,v 1.5 2010/10/30 03:46:03 uebayasi Exp $
+#      $NetBSD: Makefile.ev64260.inc,v 1.6 2014/03/03 18:25:14 joerg Exp $
 
 MKIMG?=        ${HOST_SH} ${THISPPC}/compile/walnut-mkimg.sh
 
@@ -9,5 +9,5 @@
 
 SYSTEM_LD_TAIL_EXTRA+=; \
        echo ${MKIMG} $@ $@.img ; \
-       OBJDUMP=${OBJDUMP}; OBJCOPY=${OBJCOPY}; export OBJDUMP OBJCOPY; \
-               ${MKIMG} $@ $@.img
+       OBJDUMP=${OBJDUMP}; OBJCOPY=${OBJCOPY}; STAT=${STAT}; \
+               export OBJDUMP OBJCOPY STAT; ${MKIMG} $@ $@.img
diff -r e0b382801d1d -r 4d2dc5219581 sys/arch/evbppc/conf/Makefile.obs405.inc
--- a/sys/arch/evbppc/conf/Makefile.obs405.inc  Mon Mar 03 18:21:33 2014 +0000
+++ b/sys/arch/evbppc/conf/Makefile.obs405.inc  Mon Mar 03 18:25:14 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.obs405.inc,v 1.9 2014/01/27 21:37:17 apb Exp $
+#      $NetBSD: Makefile.obs405.inc,v 1.10 2014/03/03 18:25:14 joerg Exp $
 
 CFLAGS+=-mcpu=405
 AFLAGS+=-mcpu=405
@@ -15,8 +15,8 @@
 
 SYSTEM_LD_TAIL_EXTRA+=; \
        echo ${MKIMG} $@ $@.img ; \
-       OBJDUMP=${OBJDUMP}; OBJCOPY=${OBJCOPY}; export OBJDUMP OBJCOPY; \
-               ${MKIMG} $@ $@.img
+       OBJDUMP=${OBJDUMP}; OBJCOPY=${OBJCOPY}; STAT=${STAT}; \
+               export OBJDUMP OBJCOPY STAT; ${MKIMG} $@ $@.img
 
 
 .elif ${PRDCTTYPE} == "obs266"
@@ -30,8 +30,8 @@
 
 SYSTEM_LD_TAIL_EXTRA+=; \
        echo ${MKIMG} $@ $@.img ; \
-       OBJDUMP=${OBJDUMP}; OBJCOPY=${OBJCOPY}; export OBJDUMP OBJCOPY; \
-               ${MKIMG} $@ $@.img
+       OBJDUMP=${OBJDUMP}; OBJCOPY=${OBJCOPY}; STAT=${STAT}; \
+               export OBJDUMP OBJCOPY STAT; ${MKIMG} $@ $@.img
 
 
 .elif ${PRDCTTYPE} == "obs600"
diff -r e0b382801d1d -r 4d2dc5219581 sys/arch/evbppc/conf/Makefile.walnut.inc
--- a/sys/arch/evbppc/conf/Makefile.walnut.inc  Mon Mar 03 18:21:33 2014 +0000
+++ b/sys/arch/evbppc/conf/Makefile.walnut.inc  Mon Mar 03 18:25:14 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.walnut.inc,v 1.6 2012/02/01 21:46:02 matt Exp $
+#      $NetBSD: Makefile.walnut.inc,v 1.7 2014/03/03 18:25:14 joerg Exp $
 
 MKIMG?=        ${HOST_SH} ${THISPPC}/compile/walnut-mkimg.sh
 CFLAGS+=-mcpu=403
@@ -10,5 +10,5 @@
 
 SYSTEM_LD_TAIL_EXTRA_EXTRA+=; \
        echo ${MKIMG} $@ $@.img ; \
-       OBJDUMP=${OBJDUMP}; OBJCOPY=${OBJCOPY}; export OBJDUMP OBJCOPY; \
-               ${MKIMG} $@ $@.img
+       OBJDUMP=${OBJDUMP}; OBJCOPY=${OBJCOPY}; STAT=${STAT}; \
+               export OBJDUMP OBJCOPY STAT; ${MKIMG} $@ $@.img



Home | Main Index | Thread Index | Old Index