Date: Thu, 13 Oct 2011 15:47:55 +0200 From: =?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav?= <des@des.no> To: TAKAHASHI Yoshihiro <nyan@FreeBSD.org> Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r226329 - head/usr.bin/kdump Message-ID: <86r52h9f5g.fsf@ds4.des.no> In-Reply-To: <20111013.221443.343708041391999047.nyan@FreeBSD.org> (TAKAHASHI Yoshihiro's message of "Thu, 13 Oct 2011 22:14:43 %2B0900 (JST)") References: <201110122145.p9CLjCcm085538@svn.freebsd.org> <20111013.221443.343708041391999047.nyan@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
TAKAHASHI Yoshihiro <nyan@FreeBSD.org> writes:
> This change breaks cross building.
Damn, you're right. Will this work?
Index: usr.bin/kdump/mkioctls
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- usr.bin/kdump/mkioctls (revision 226329)
+++ usr.bin/kdump/mkioctls (working copy)
@@ -13,15 +13,16 @@
=20
# Build a list of headers that have ioctls in them.
# XXX should we use an ANSI cpp?
-ioctl_includes=3D`
+ioctl_includes=3D$(
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)}'
+)
=20
-case "`uname -m`" in
+: ${MACHINE=3D$(uname -m)}
+case "${MACHINE}" in
*pc98*)
ioctl_includes=3D"$ioctl_includes#include <sys/diskpc98.h>\\n"
;;
Index: usr.bin/kdump/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- usr.bin/kdump/Makefile (revision 226329)
+++ usr.bin/kdump/Makefile (working copy)
@@ -21,7 +21,8 @@
CLEANFILES=3D ioctl.c kdump_subr.c kdump_subr.h linux_syscalls.c
=20
ioctl.c: mkioctls
- sh ${.CURDIR}/mkioctls ${DESTDIR}/usr/include > ${.TARGET}
+ env MACHINE=3D${TARGET} \
+ sh ${.CURDIR}/mkioctls ${DESTDIR}/usr/include > ${.TARGET}
=20
kdump_subr.h: mksubr
sh ${.CURDIR}/mksubr ${DESTDIR}/usr/include | \
DES
--=20
Dag-Erling Sm=C3=B8rgrav - des@des.no
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?86r52h9f5g.fsf>