Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 4 Mar 2021 09:59:17 +0000 (UTC)
From:      Gerald Pfeifer <gerald@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org
Subject:   svn commit: r567298 - branches/2021Q1/lang/gcc9
Message-ID:  <202103040959.1249xHIv036097@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: gerald
Date: Thu Mar  4 09:59:17 2021
New Revision: 567298
URL: https://svnweb.freebsd.org/changeset/ports/567298

Log:
  MFH: r567263
  
  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:
  branches/2021Q1/lang/gcc9/Makefile
Directory Properties:
  branches/2021Q1/   (props changed)

Modified: branches/2021Q1/lang/gcc9/Makefile
==============================================================================
--- branches/2021Q1/lang/gcc9/Makefile	Thu Mar  4 09:58:08 2021	(r567297)
+++ branches/2021Q1/lang/gcc9/Makefile	Thu Mar  4 09:59:17 2021	(r567298)
@@ -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}
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202103040959.1249xHIv036097>