git: fede9d5b3388 - main - lang/gcc6-aux: unbreak with isl-27, cleanup

The branch main has been updated by fluffy:

URL: https://cgit.FreeBSD.org/ports/commit/?id=fede9d5b3388a927767b4851a81b08a98ae7081b

commit fede9d5b3388a927767b4851a81b08a98ae7081b
Author:     Dima Panov <fluffy@FreeBSD.org>
AuthorDate: 2026-03-16 12:59:01 +0000
Commit:     Dima Panov <fluffy@FreeBSD.org>
CommitDate: 2026-03-16 13:05:39 +0000

    lang/gcc6-aux: unbreak with isl-27, cleanup
    
    ISL27 have noved own isl_val_* definition to dedicated header, isl/val.h
    Chase it to unbreak build
    
    Make graphite loop optimization optional; off by default to mimics previous behaviour
    Cleanup make environment
    
    PR:     292414
---
 lang/gcc6-aux/Makefile                    | 21 +++++++++++++--------
 lang/gcc6-aux/files/patch-isl-20-or-newer |  3 ++-
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/lang/gcc6-aux/Makefile b/lang/gcc6-aux/Makefile
index 7c2b906b3327..362effa85b65 100644
--- a/lang/gcc6-aux/Makefile
+++ b/lang/gcc6-aux/Makefile
@@ -29,6 +29,7 @@ LDFLAGS+=		-L${LOCALBASE}/lib
 
 PIE_UNSAFE=		yes
 
+OPTIONS_DEFINE=		GRAPHITE
 OPTIONS_GROUP=		STANDARD BOOTSTRAP
 OPTIONS_GROUP_STANDARD=	FORTRAN OBJC NLS TESTSUITE ALLSTAGES STATIC
 OPTIONS_GROUP_BOOTSTRAP=BOOTSTRAP
@@ -39,6 +40,10 @@ TESTSUITE_DESC=		Activate test support
 ALLSTAGES_DESC=		Build compiler with itself (twice, brings in libcc1)
 STATIC_DESC=		Link compilers and drivers statically
 BOOTSTRAP_DESC=		Create bootstrap compiler (overrides other options)
+GRAPHITE_DESC=		Support for Graphite loop optimizations
+
+GRAPHITE_LIB_DEPENDS=		libisl.so:devel/isl
+GRAPHITE_CONFIGURE_WITH+=	isl
 
 # The BOOTSTRAP option overrides all the others.  "make stage" will build a
 # static compiler that supports C, C++, and Ada languages and then create
@@ -213,44 +218,44 @@ post-extract:
 
 do-configure:
 	${MKDIR} ${BUILDDIR}
-	cd ${BUILDDIR} && ${SETENV} ${ADA_CONFIGURE_ENV} \
+	cd ${BUILDDIR} && ${SETENVI} ${WRK_ENV} ${ADA_CONFIGURE_ENV} \
 		${CFG_SCRIPT} ${ADA_CONFIG_ARGS}
 
 do-build:
-	cd ${BUILDDIR} && ${SETENV} ${ADA_MAKE_ENV} \
+	cd ${BUILDDIR} && ${SETENVI} ${WRK_ENV} ${ADA_MAKE_ENV} \
 		${MAKE_CMD} -j${MAKE_JOBS_NUMBER} ${MAKE_ARGS} all
 
 .if ${PORT_OPTIONS:MTESTSUITE} && !${PORT_OPTIONS:MBOOTSTRAP}
 test: build test-ada test-fortran test-objc test-cxx test-c
 
 test-ada:
-	cd ${BUILDDIR} && ${SETENV} ${ADA_MAKE_ENV} \
+	cd ${BUILDDIR} && ${SETENVI} ${WRK_ENV} ${ADA_MAKE_ENV} \
 		${MAKE_CMD} -sk check-ada
 
 test-cxx:
 	# libstdc++ testsuite will break every time, for TRUE to continue
-	cd ${BUILDDIR} && ${SETENV} ${ADA_MAKE_ENV} \
+	cd ${BUILDDIR} && ${SETENVI} ${WRK_ENV} ${ADA_MAKE_ENV} \
 		${MAKE_CMD} -j${MAKE_JOBS_NUMBER} -sk check-c++ || true
 
 test-c:
-	cd ${BUILDDIR} && ${SETENV} ${ADA_MAKE_ENV} \
+	cd ${BUILDDIR} && ${SETENVI} ${WRK_ENV} ${ADA_MAKE_ENV} \
 		${MAKE_CMD} -j${MAKE_JOBS_NUMBER} -sk check-c
 
 test-fortran:
 .  if ${PORT_OPTIONS:MFORTRAN}
-	cd ${BUILDDIR} && ${SETENV} ${ADA_MAKE_ENV} \
+	cd ${BUILDDIR} && ${SETENVI} ${WRK_ENV} ${ADA_MAKE_ENV} \
 		${MAKE_CMD} -j${MAKE_JOBS_NUMBER} -sk check-fortran
 .  endif
 
 test-objc:
 .  if ${PORT_OPTIONS:MOBJC}
-	cd ${BUILDDIR} && ${SETENV} ${ADA_MAKE_ENV} \
+	cd ${BUILDDIR} && ${SETENVI} ${WRK_ENV} ${ADA_MAKE_ENV} \
 		${MAKE_CMD} -j${MAKE_JOBS_NUMBER} -sk check-objc
 .  endif
 .endif
 
 do-install:
-	cd ${BUILDDIR} && ${SETENV} ${ADA_MAKE_ENV} \
+	cd ${BUILDDIR} && ${SETENVI} ${WRK_ENV} ${ADA_MAKE_ENV} \
 		${MAKE_CMD} install-strip ${MAKE_ARGS}
 	${MV} ${STAGEDIR}${PKG_PREFIX}/share ${WRKDIR}/moved_share
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/dejagnu/baseboards \
diff --git a/lang/gcc6-aux/files/patch-isl-20-or-newer b/lang/gcc6-aux/files/patch-isl-20-or-newer
index a97f412ab0dc..6326036f35a1 100644
--- a/lang/gcc6-aux/files/patch-isl-20-or-newer
+++ b/lang/gcc6-aux/files/patch-isl-20-or-newer
@@ -1,11 +1,12 @@
 --- gcc/graphite.h.orig	2020-08-15 14:22:45.859708000 -0400
 +++ gcc/graphite.h	2020-08-15 14:25:15.832648000 -0400
-@@ -36,6 +36,8 @@
+@@ -36,6 +36,9 @@ along with GCC; see the file COPYING3.  If not see
  #include <isl/ilp.h>
  #include <isl/schedule.h>
  #include <isl/ast_build.h>
 +#include <isl/id.h>
 +#include <isl/space.h>
++#include <isl/val.h>
  
  #ifdef HAVE_ISL_OPTIONS_SET_SCHEDULE_SERIALIZE_SCCS
  /* isl 0.15 or later.  */