Re: misc/brltty: prevent from using linux/input.h if present

On 2023/11/02 20:41, Stuart Henderson wrote:
> On 2023/11/02 21:11, Rafael Sadowski wrote:
> > Remove all possibilities to find linux/input.h. OK?
> >
> > Index: Makefile
> > ===================================================================
> > RCS file: /cvs/ports/misc/brltty/Makefile,v
> > diff -u -p -r1.25 Makefile
> > --- Makefile 27 Sep 2023 09:52:09 -0000 1.25
> > +++ Makefile 2 Nov 2023 20:09:34 -0000
> > @@ -1,7 +1,7 @@
> > COMMENT= access software for a blind person using a braille terminal
> >
> > DISTNAME= brltty-3.6
> > -REVISION= 7
> > +REVISION= 8
> > CATEGORIES= misc
> > HOMEPAGE= https://brltty.app
> > SITES= https://brltty.app/archive/
> > Index: patches/patch-configure
> > ===================================================================
> > RCS file: /cvs/ports/misc/brltty/patches/patch-configure,v
> > diff -u -p -r1.5 patch-configure
> > --- patches/patch-configure 11 Mar 2022 19:38:05 -0000 1.5
> > +++ patches/patch-configure 2 Nov 2023 20:09:35 -0000
> > @@ -1,7 +1,37 @@
> > Index: configure
> > --- configure.orig
> > +++ configure
> > -@@ -7790,6 +7790,7 @@ _ACEOF
> > +@@ -6605,7 +6605,7 @@ done
> > +
> > +
> > +
> > +-for ac_header in sys/io.h sys/modem.h machine/speaker.h linux/vt.h linux/input.h
> > ++for ac_header in sys/io.h sys/modem.h machine/speaker.h linux/vt.h
> > + do
> > + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
> > + if eval "test \"\${$as_ac_Header+set}\" = set"; then
> > +@@ -6755,20 +6755,6 @@ echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
> > + if eval "test \"\${$as_ac_Header+set}\" = set"; then
> > + echo $ECHO_N "(cached) $ECHO_C" >&6
> > + else
> > +- cat >conftest.$ac_ext <<_ACEOF
> > +-#line $LINENO "configure"
> > +-/* confdefs.h. */
> > +-_ACEOF
> > +-cat confdefs.h >>conftest.$ac_ext
> > +-cat >>conftest.$ac_ext <<_ACEOF
> > +-/* end confdefs.h. */
> > +-
> > +-#include <linux/input.h>
> > +-
> > +-
> > +-#include <$ac_header>
> > +-_ACEOF
> > +-rm -f conftest.$ac_objext
> > + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
> > + (eval $ac_compile) 2>&5
> > + ac_status=$?
> > +@@ -7790,6 +7776,7 @@ _ACEOF
> > ;;
> > openbsd*)
> > system_object="openbsd"
> >
>
> You've removed too much. No need to touch configure at all though:
>
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/misc/brltty/Makefile,v
> retrieving revision 1.25
> diff -u -p -r1.25 Makefile
> --- Makefile 27 Sep 2023 09:52:09 -0000 1.25
> +++ Makefile 2 Nov 2023 20:40:55 -0000
> @@ -17,6 +17,7 @@ WANTLIB= c curses pthread sndio
> RUN_DEPENDS= screen-*-shm:misc/screen-shm
> USE_GMAKE= Yes
> CONFIGURE_STYLE=gnu
> +CONFIGURE_ENV= ac_cv_header_linux_input_h=no
> CONFIGURE_ARGS= --with-install-root=${WRKINST} \
> --with-data-directory=${LOCALBASE}/share/brltty \
> --without-flite --without-x
>

...rather than patching all over the place, would it make sense to hide
linux/input.h under a subdir so you need to add an -I to CPPFLAGS to
actually use it?