From owner-svn-src-all@FreeBSD.ORG Thu Oct 13 13:47:57 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2C12610656B7; Thu, 13 Oct 2011 13:47:57 +0000 (UTC) (envelope-from des@des.no) Received: from smtp.des.no (smtp.des.no [194.63.250.102]) by mx1.freebsd.org (Postfix) with ESMTP id DDC128FC13; Thu, 13 Oct 2011 13:47:56 +0000 (UTC) Received: from ds4.des.no (des.no [84.49.246.2]) by smtp.des.no (Postfix) with ESMTP id 251A01FFC33; Thu, 13 Oct 2011 13:47:56 +0000 (UTC) Received: by ds4.des.no (Postfix, from userid 1001) id 06A64B93C; Thu, 13 Oct 2011 15:47:55 +0200 (CEST) From: =?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav?= To: TAKAHASHI Yoshihiro References: <201110122145.p9CLjCcm085538@svn.freebsd.org> <20111013.221443.343708041391999047.nyan@FreeBSD.org> Date: Thu, 13 Oct 2011 15:47:55 +0200 In-Reply-To: <20111013.221443.343708041391999047.nyan@FreeBSD.org> (TAKAHASHI Yoshihiro's message of "Thu, 13 Oct 2011 22:14:43 +0900 (JST)") Message-ID: <86r52h9f5g.fsf@ds4.des.no> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.3 (berkeley-unix) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r226329 - head/usr.bin/kdump X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 Oct 2011 13:47:57 -0000 TAKAHASHI Yoshihiro 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 \\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