svn commit: r567263 - head/lang/gcc9

[Gerald Pfeifer]

Author: gerald
Date: Wed Mar  3 21:43:02 2021
New Revision: 567263
URL: https://svnweb.freebsd.org/changeset/ports/567263

Log:
  Back port part of r566296 | gerald | 2021-02-22 from lang/gcc9-devel:
  
    [B]ack port of part of r565301 | gerald | 2021-02-15 from
    lang/gcc11-devel:
  
      Explicitly build --without-zstd such that archivers/zstd isn't pulled
      in inadvertedly when present in the build system even though it is not
      an explicit dependency. [1]
  
  Back port part of r566885 | gerald | 2021-03-01 from lang/gcc9-devel:
  
    Remove the GRAPHITE option. Graphite still is a largely experimental
    feature, so better left to newer versions of GCC such as GCC 10 which
    is now our default.
  
  PR:		253286 [1]

Modified:
  head/lang/gcc9/Makefile

Modified: head/lang/gcc9/Makefile
==============================================================================
--- head/lang/gcc9/Makefile	Wed Mar  3 21:41:14 2021	(r567262)
+++ head/lang/gcc9/Makefile	Wed Mar  3 21:43:02 2021	(r567263)
@@ -3,7 +3,7 @@
 
 PORTNAME=	gcc
 PORTVERSION=	9.3.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	lang
 MASTER_SITES=	GCC
 PKGNAMESUFFIX=	${SUFFIX}
@@ -38,10 +38,9 @@ SUFFIX=		${PORTVERSION:C/([0-9]+).*/\1/}
 CFLAGS:=	${CFLAGS:N-mretpoline}
 CXXFLAGS:=	${CXXFLAGS:N-mretpoline}
 
-OPTIONS_DEFINE=		BOOTSTRAP GRAPHITE
+OPTIONS_DEFINE=		BOOTSTRAP
 OPTIONS_DEFAULT=	BOOTSTRAP
 BOOTSTRAP_DESC=		Build using a full bootstrap
-GRAPHITE_DESC=		Support for Graphite loop optimizations
 
 .if exists(/usr/lib32/libc.so)
 OPTIONS_DEFINE_amd64+=		MULTILIB
@@ -97,7 +96,8 @@ CONFIGURE_ARGS+=--disable-nls \
 		--with-ld=${LOCALBASE}/bin/ld \
 		${ICONV_CONFIGURE_ARG} \
 		--with-pkgversion="FreeBSD Ports Collection" \
-		--with-system-zlib
+		--with-system-zlib \
+		--without-zstd
 MAKE_ARGS+=	MAKEINFOFLAGS="--no-split"
 USE_LDCONFIG=	${TARGLIB}
 PLIST_SUB+=	GCC_VERSION=${GCC_VERSION} \
@@ -115,11 +115,6 @@ INFO+=		gcc${SUFFIX}/libquadmath \
 		gcc${SUFFIX}/libitm
 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}