On 2025/08/04 20:33, Edd Barrett wrote:
> Hi Naddy,
> 
> On Mon, Aug 04, 2025 at 12:15:38AM +0200, Christian Weisgerber wrote:
> > math/graphviz failed to build in my latest amd64 bulk build.  This
> > looks like a sporadic failure related to guile.  The graphviz port
> > depends on guile2, but the build seems to have picked up guile3.
> 
> I figured it out. This happens when:
> 
>  - guile 3 is installed a configure time
>  - but guile 3 is removed/junked before the guile plugin is built.
>  - AND guile version 1 is not installed (otherwise it picks up libguile.h from
>    /usr/local/include accidentally).
> 
> The following diff, which disables looking for any guile-config apart from the
> one we want, seems to fix this.

how about this instead? seems easier to find if changing to a newer
guile than hidden away in a patch.

Index: Makefile
===================================================================
RCS file: /cvs/ports/math/graphviz/Makefile,v
diff -u -p -r1.88 Makefile
--- Makefile	28 Jul 2025 08:28:52 -0000	1.88
+++ Makefile	5 Aug 2025 10:37:10 -0000
@@ -125,7 +125,8 @@ CONFIGURE_ARGS+= --with-tclsh=${MODTCL_B
 CONFIGURE_ENV=	CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \
 		LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib" \
 		TCLCONFIG=${MODTCL_CONFIG} \
-		GUILE=guile2.2
+		GUILE=guile2.2 \
+		GUILE_CONFIG=guile-config2.2
 
 DOCBASE=	${PREFIX}/share/doc/graphviz
 EXBASE=		${PREFIX}/share/examples/graphviz


I think it's equivalent.


> After this, if guile1 is installed, we shouldn't pick up its header because of
> the order of the -I arguments:
> 
> ```
> c++ ... -I/usr/local/include/guile/2.2 -I/usr/local/include ...
> ```
> 
> OK?
> 
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/math/graphviz/Makefile,v
> diff -u -p -r1.88 Makefile
> --- Makefile	28 Jul 2025 08:28:52 -0000	1.88
> +++ Makefile	4 Aug 2025 19:19:05 -0000
> @@ -6,7 +6,7 @@ DISTNAME=	graphviz-$V
>  PKGNAME-main=	${DISTNAME}
>  PKGNAME-tcl=	graphviz-tcl-$V
>  CATEGORIES=	math devel graphics
> -REVISION-main=	1
> +REVISION-main=	2
>  REVISION-tcl=	0
>  
>  MULTI_PACKAGES=	-main -tcl
> Index: patches/patch-configure_ac
> ===================================================================
> RCS file: /cvs/ports/math/graphviz/patches/patch-configure_ac,v
> diff -u -p -r1.4 patch-configure_ac
> --- patches/patch-configure_ac	16 Apr 2024 13:33:19 -0000	1.4
> +++ patches/patch-configure_ac	4 Aug 2025 19:18:59 -0000
> @@ -10,7 +10,12 @@ Index: configure.ac
>       ;;
>   esac
>   AC_DEFINE_UNQUOTED(GVPLUGIN_VERSION,$GVPLUGIN_VERSION,[Compatibility version number for plugins.])
> -@@ -600,7 +600,7 @@ else
> +@@ -596,11 +596,11 @@ else
> +     if test `$SWIG -help 2>&1 | $EGREP -c '\-guile *- Generate'` = 0; then
> +       use_guile="No (swig does not support -guile option)"
> +     else
> +-      AC_CHECK_PROGS(GUILE_CONFIG,guile-config3.0 guile-config2.2 guile-config)
> ++      AC_CHECK_PROGS(GUILE_CONFIG,guile-config2.2)
>         if test "$GUILE_CONFIG" = ""; then
>           use_guile="No (guile not available)"
>         else
> 
> -- 
> Best Regards
> Edd Barrett
> 
> https://www.theunixzoo.co.uk
>