Date: Thu, 13 Oct 2011 16:29:24 +0000 (UTC) From: Dag-Erling Smorgrav <des@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r226344 - head/usr.bin/kdump Message-ID: <201110131629.p9DGTOLF023247@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: des Date: Thu Oct 13 16:29:24 2011 New Revision: 226344 URL: http://svn.freebsd.org/changeset/base/226344 Log: Clean up mkioctls a bit, and fix cross-building by checking ${MACHINE} instead of $(uname -m). Pointed out by: nyan@ Modified: head/usr.bin/kdump/Makefile head/usr.bin/kdump/mkioctls Modified: head/usr.bin/kdump/Makefile ============================================================================== --- head/usr.bin/kdump/Makefile Thu Oct 13 16:20:10 2011 (r226343) +++ head/usr.bin/kdump/Makefile Thu Oct 13 16:29:24 2011 (r226344) @@ -21,7 +21,8 @@ NO_WERROR?= YES CLEANFILES= ioctl.c kdump_subr.c kdump_subr.h linux_syscalls.c ioctl.c: mkioctls - sh ${.CURDIR}/mkioctls ${DESTDIR}/usr/include > ${.TARGET} + env MACHINE=${MACHINE} \ + sh ${.CURDIR}/mkioctls ${DESTDIR}/usr/include > ${.TARGET} kdump_subr.h: mksubr sh ${.CURDIR}/mksubr ${DESTDIR}/usr/include | \ Modified: head/usr.bin/kdump/mkioctls ============================================================================== --- head/usr.bin/kdump/mkioctls Thu Oct 13 16:20:10 2011 (r226343) +++ head/usr.bin/kdump/mkioctls Thu Oct 13 16:29:24 2011 (r226344) @@ -13,15 +13,16 @@ LC_ALL=C; export LC_ALL # 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" ;;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201110131629.p9DGTOLF023247>