> I don't fully understand the make job race inside this GNU auto*/make code,
> but here's the same update with a simpler Makefile.in patch that reliably
> packages bison regardless of MAKE_JOBS.

That works for me. No fallout in an amd64 bulk, so it seems the failures
we saw a few years back when millert tried to update to 3.8.0 are now
resolved one way or the other.

I havent really looked at this gmake/automake madness and don't know
much about bison and how it's used at all.

Would probably be good if someone who has a clue about it and its build
system took a look, but as far as I'm concerned, there's no reason this
can't go in.


> 
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/devel/bison/Makefile,v
> retrieving revision 1.66
> diff -u -p -r1.66 Makefile
> --- Makefile  21 Sep 2023 09:49:49 -0000      1.66
> +++ Makefile  12 Oct 2023 16:32:23 -0000
> @@ -1,6 +1,6 @@
>  COMMENT=     GNU parser generator
>  
> -DISTNAME=    bison-3.7.6
> +DISTNAME=    bison-3.8.2
>  CATEGORIES=  devel
>  SITES=               ${SITE_GNU:=bison/}
>  EXTRACT_SUFX=        .tar.xz
> @@ -19,6 +19,8 @@ BUILD_DEPENDS=      devel/gettext,-tools \
>  RUN_DEPENDS= devel/m4
>  
>  CONFIGURE_STYLE=gnu
> +CONFIGURE_ENV=       ac_cv_prog_VALGRIND=no \
> +             ac_cv_path_XSLTPROC=no
>  CONFIGURE_ARGS=      --disable-yacc
>  # Avoid crashes because of bad interactions between bison, libtextstyle
>  # from devel/gettext and ncurses
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/devel/bison/distinfo,v
> retrieving revision 1.14
> diff -u -p -r1.14 distinfo
> --- distinfo  17 May 2021 16:41:44 -0000      1.14
> +++ distinfo  12 Oct 2023 16:32:23 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (bison-3.7.6.tar.xz) = Z9aM4eIhkgUFJWQ/wKeiIpdXZoK+9qXFFEaQP1ru888=
> -SIZE (bison-3.7.6.tar.xz) = 2627180
> +SHA256 (bison-3.8.2.tar.xz) = m7oCFMz38QecXVkhAEUie89hlRmEDr+oDNOEnP9aW/I=
> +SIZE (bison-3.8.2.tar.xz) = 2817324
> Index: patches/patch-Makefile_in
> ===================================================================
> RCS file: /cvs/ports/devel/bison/patches/patch-Makefile_in,v
> retrieving revision 1.2
> diff -u -p -r1.2 patch-Makefile_in
> --- patches/patch-Makefile_in 11 Mar 2022 18:49:44 -0000      1.2
> +++ patches/patch-Makefile_in 12 Oct 2023 18:19:20 -0000
> @@ -1,14 +1,14 @@
> -Break the "bison.help: bison" dependency to avoid rebuilding bison.info.
> +Breaking the "bison.help: bison" dependency is non-trivial with MAKE_JOBS>1;
> +instead make the problematic target a NOOP.
>  
>  Index: Makefile.in
>  --- Makefile.in.orig
>  +++ Makefile.in
> -@@ -10432,7 +10432,7 @@ $(srcdir)/$(doc_bison).info.bak: 
> $(srcdir)/$(doc_bison
> +@@ -9579,6 +9579,7 @@ doc/$(am__dirstamp):
> +     @: > doc/$(am__dirstamp)
>   
> - doc/refcard.pdf: doc/refcard.tex
> -     $(AM_V_GEN) cd doc && pdftex $(abs_top_srcdir)/doc/refcard.tex
> --@CROSS_COMPILING_FALSE@$(top_srcdir)/doc/bison.help: src/bison$(EXEEXT)
> -+@CROSS_COMPILING_FALSE@$(top_srcdir)/doc/bison.help: #src/bison$(EXEEXT)
> - @CROSS_COMPILING_FALSE@     $(AM_V_GEN)$(MKDIR_P) doc
> - @CROSS_COMPILING_FALSE@     $(AM_V_at) LC_ALL=C tests/bison --version 
> >doc/bison.help.tmp
> - @CROSS_COMPILING_FALSE@     $(AM_V_at) LC_ALL=C tests/bison --help | \
> + $(srcdir)/doc/bison.info: doc/bison.texi $(srcdir)/doc/version.texi 
> $(doc_bison_TEXINFOS)
> ++neutered-bison-info:
> +     $(AM_V_MAKEINFO)restore=: && backupdir="$(am__leading_dot)am$$$$" && \
> +     am__cwd=`pwd` && $(am__cd) $(srcdir) && \
> +     rm -rf $$backupdir && mkdir $$backupdir && \
> Index: pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/devel/bison/pkg/PLIST,v
> retrieving revision 1.15
> diff -u -p -r1.15 PLIST
> --- pkg/PLIST 11 Mar 2022 18:49:45 -0000      1.15
> +++ pkg/PLIST 12 Oct 2023 16:32:23 -0000
> @@ -11,7 +11,6 @@ share/bison/m4sugar/
>  share/bison/m4sugar/foreach.m4
>  share/bison/m4sugar/m4sugar.m4
>  share/bison/skeletons/
> -share/bison/skeletons/README-D.txt
>  share/bison/skeletons/bison.m4
>  share/bison/skeletons/c++-skel.m4
>  share/bison/skeletons/c++.m4
> @@ -22,6 +21,7 @@ share/bison/skeletons/d-skel.m4
>  share/bison/skeletons/d.m4
>  share/bison/skeletons/glr.c
>  share/bison/skeletons/glr.cc
> +share/bison/skeletons/glr2.cc
>  share/bison/skeletons/java-skel.m4
>  share/bison/skeletons/java.m4
>  share/bison/skeletons/lalr1.cc
> @@ -70,6 +70,10 @@ share/doc/bison/examples/c/calc/
>  share/doc/bison/examples/c/calc/Makefile
>  share/doc/bison/examples/c/calc/README.md
>  share/doc/bison/examples/c/calc/calc.y
> +share/doc/bison/examples/c/glr/
> +share/doc/bison/examples/c/glr/Makefile
> +share/doc/bison/examples/c/glr/README.md
> +share/doc/bison/examples/c/glr/c++-types.y
>  share/doc/bison/examples/c/lexcalc/
>  share/doc/bison/examples/c/lexcalc/Makefile
>  share/doc/bison/examples/c/lexcalc/README.md
> @@ -92,9 +96,13 @@ share/doc/bison/examples/c/rpcalc/
>  share/doc/bison/examples/c/rpcalc/Makefile
>  share/doc/bison/examples/c/rpcalc/rpcalc.y
>  share/doc/bison/examples/d/
> -share/doc/bison/examples/d/Makefile
>  share/doc/bison/examples/d/README.md
> -share/doc/bison/examples/d/calc.y
> +share/doc/bison/examples/d/calc/
> +share/doc/bison/examples/d/calc/Makefile
> +share/doc/bison/examples/d/calc/calc.y
> +share/doc/bison/examples/d/simple/
> +share/doc/bison/examples/d/simple/Makefile
> +share/doc/bison/examples/d/simple/calc.y
>  share/doc/bison/examples/java/
>  share/doc/bison/examples/java/README.md
>  share/doc/bison/examples/java/calc/

Reply via email to