TAKAHASHI Yoshihiro <n...@freebsd.org> writes:
> This change breaks cross building.

Damn, you're right.  Will this work?

Index: usr.bin/kdump/mkioctls
===================================================================
--- usr.bin/kdump/mkioctls      (revision 226329)
+++ usr.bin/kdump/mkioctls      (working copy)
@@ -13,15 +13,16 @@
 
 # Build a list of headers that have ioctls in them.
 # XXX should we use an ANSI cpp?
-ioctl_includes=`
+ioctl_includes=$(
        cd $1
        find -H -s * -name '*.h' | grep -v '.*disk.*\.h' | \
                xargs egrep -l \
 '^#[   ]*define[       ]+[A-Za-z_][A-Za-z0-9_]*[       ]+_IO[^a-z0-9_]' |
-               awk '{printf("#include <%s>\\\\n", $1)}'
-`
+               awk '{printf("#include <%s>\\n", $1)}'
+)
 
-case "`uname -m`" in
+: ${MACHINE=$(uname -m)}
+case "${MACHINE}" in
 *pc98*)
        ioctl_includes="$ioctl_includes#include <sys/diskpc98.h>\\n"
        ;;
Index: usr.bin/kdump/Makefile
===================================================================
--- usr.bin/kdump/Makefile      (revision 226329)
+++ usr.bin/kdump/Makefile      (working copy)
@@ -21,7 +21,8 @@
 CLEANFILES=    ioctl.c kdump_subr.c kdump_subr.h linux_syscalls.c
 
 ioctl.c: mkioctls
-       sh ${.CURDIR}/mkioctls ${DESTDIR}/usr/include > ${.TARGET}
+       env MACHINE=${TARGET} \
+           sh ${.CURDIR}/mkioctls ${DESTDIR}/usr/include > ${.TARGET}
 
 kdump_subr.h: mksubr
        sh ${.CURDIR}/mksubr ${DESTDIR}/usr/include | \


DES
-- 
Dag-Erling Smørgrav - d...@des.no
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Reply via email to