1
0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-20 08:27:15 +00:00

Fix-up for 8.0-CURRENT. src/stty.c fails to compile due to TAB1 and TAB2

termios bits being undefined.  They've been moved to sys/ioctl_compat.h which
requires _KERNEL be defined.  Somewhat of an ugly hack; possible alternative
would be to remove use of TAB1 and TAB2 in src/stty.c altogether.

Reported by:	jsa @ EFnet
This commit is contained in:
Jeremy Chadwick 2008-08-28 12:06:21 +00:00
parent e65a34d9ca
commit 11e7c7e8e8
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=219372
2 changed files with 23 additions and 1 deletions

View File

@ -50,6 +50,12 @@ MAN1= gbasename.1 gcat.1 gchgrp.1 gchmod.1 gchown.1 gchroot.1 gcksum.1 \
gwc.1 gwho.1 gwhoami.1 gyes.1 gbase64.1 gsha224sum.1 gsha256sum.1 \
gsha384sum.1 gsha512sum.1 gshuf.1
.include <bsd.port.pre.mk>
.if ${OSVERSION} >= 800000
EXTRA_PATCHES= ${PATCHDIR}/extra-patch-stty.c
.endif
post-patch:
.if !defined(WITH_SUID)
@${REINPLACE_CMD} -e "s/u\+s/u\+w/g" ${WRKSRC}/src/Makefile.in
@ -61,4 +67,4 @@ post-build:
regression-test: build
(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${GMAKE} check)
.include <bsd.port.mk>
.include <bsd.port.post.mk>

View File

@ -0,0 +1,16 @@
--- src/stty.c.orig 2007-03-18 14:36:43.000000000 -0700
+++ src/stty.c 2008-08-28 04:43:28.000000000 -0700
@@ -45,6 +45,13 @@
#endif
#ifdef HAVE_SYS_IOCTL_H
# include <sys/ioctl.h>
+/*
+ * XXX - Workaround for missing TAB1 and TAB2 bits on 8.0-CURRENT;
+ * available in src/ioctl_compat.h, only when _KERNEL is defined.
+ */
+# define _KERNEL
+# include <sys/ioctl_compat.h>
+# undef _KERNEL
#endif
#ifdef WINSIZE_IN_PTEM