git: 1846a7fe9b58 - main - lang/gcc12: Fix linking with libisl.so

From: Lorenzo Salvadore <salvadore_at_FreeBSD.org>
Date: Wed, 05 Mar 2025 15:33:14 UTC
The branch main has been updated by salvadore:

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

commit 1846a7fe9b587894845d69a895510f37eb2f40d8
Author:     Lorenzo Salvadore <salvadore@FreeBSD.org>
AuthorDate: 2025-03-04 10:29:58 +0000
Commit:     Lorenzo Salvadore <salvadore@FreeBSD.org>
CommitDate: 2025-03-05 15:32:48 +0000

    lang/gcc12: Fix linking with libisl.so
    
    Fix linking with libisl.so depending on GRAPHITE option, which is
    now implemented through options helpers.
    
    Co-authored-by: Gerald Pfeifer <gerald@FreeBSD.org>
    
    PR:         276070
    Reported by:Ivan Rozhuk <rozhuk.im@gmail.com>
---
 lang/gcc12/Makefile | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/lang/gcc12/Makefile b/lang/gcc12/Makefile
index 66b1aaf674a9..2eb968b03568 100644
--- a/lang/gcc12/Makefile
+++ b/lang/gcc12/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	gcc
 PORTVERSION=	12.4.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	lang
 MASTER_SITES=	GCC
 PKGNAMESUFFIX=	${SUFFIX}
@@ -65,6 +65,9 @@ CFLAGS:=	${CFLAGS:S/mcpu=g/mcpu=G/}
 CXXFLAGS:=	${CFLAGS:S/mcpu=g/mcpu=G/}
 .endif
 
+GRAPHITE_LIB_DEPENDS=          libisl.so:devel/isl
+GRAPHITE_CONFIGURE_WITH+=      isl
+
 .include <bsd.port.pre.mk>
 
 # Extraction fails with poudriere on aarch64 for GCC 12.
@@ -141,11 +144,6 @@ INFO+=		gcc${SUFFIX}/libquadmath \
 SUB_FILES=	pkg-message
 SUB_LIST+=	TARGLIB=${TARGLIB}
 
-.if ${PORT_OPTIONS:MGRAPHITE}
-LIB_DEPENDS+=	libisl.so:devel/isl
-CONFIGURE_ARGS+=--with-isl=${LOCALBASE}
-.endif
-
 CONFIGURE_ARGS+=--enable-languages=${LANGUAGES}
 
 pre-everything::