[Pkg-sysvinit-devel] Bug#579293: sysvinit: FTBFS on kfreebsd-*: 'VSWTC' undeclared

[Petter Reinholdtsen]

[Cyril Brulebois]
> your package no longer builds on kfreebsd-*:
> | cc -g -O2 -W -Wall -D_GNU_SOURCE  -DACCTON_OFF   -c -o init.o init.c
> | init.c: In function 'console_stty':
> | init.c:773: error: 'VSWTC' undeclared (first use in this function)
> | init.c:773: error: (Each undeclared identifier is reported only once
> | init.c:773: error: for each function it appears in.)
> | init.c:791: error: expected ';' before 'tty'
> | make[1]: *** [init.o] Error 1

Thank you.  Just the reason I uploaded to experimental first. :)

The latter part is a simple typo, and a fix is commited to svn.

The former I am more unsure about.  Based on
<URL: http://www.mail-archive.com/debian-bsd@lists.debian.org/msg01710.html >,
I suspect a fix would be something like this.

Index: src/init.c
===================================================================
--- src/init.c  (revision 1869)
+++ src/init.c  (working copy)
@@ -770,7 +770,11 @@
        tty.c_cc[VEOF]      = CEOF;
        tty.c_cc[VTIME]     = 0;
        tty.c_cc[VMIN]      = 1;
+#ifdef __linux__
        tty.c_cc[VSWTC]     = _POSIX_VDISABLE;
+#else /* not __linux__ */
+       tty.c_cc[VSWTCH]    = _POSIX_VDISABLE;
+#endif /* not __linux__ */
        tty.c_cc[VSTART]    = CSTART;
        tty.c_cc[VSTOP]     = CSTOP;
        tty.c_cc[VSUSP]     = CSUSP;

Do you know kfreebsd enough to know if this is the correct solution?

Happy hacking,
-- 
Petter Reinholdtsen