From owner-svn-ports-all@freebsd.org Thu Mar 4 09:59:17 2021 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id CB3C856AC28; Thu, 4 Mar 2021 09:59:17 +0000 (UTC) (envelope-from gerald@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DrmYK5NhGz3DcV; Thu, 4 Mar 2021 09:59:17 +0000 (UTC) (envelope-from gerald@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id AC0241B0A0; Thu, 4 Mar 2021 09:59:17 +0000 (UTC) (envelope-from gerald@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 1249xHLr036098; Thu, 4 Mar 2021 09:59:17 GMT (envelope-from gerald@FreeBSD.org) Received: (from gerald@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 1249xHIv036097; Thu, 4 Mar 2021 09:59:17 GMT (envelope-from gerald@FreeBSD.org) Message-Id: <202103040959.1249xHIv036097@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gerald set sender to gerald@FreeBSD.org using -f From: Gerald Pfeifer Date: Thu, 4 Mar 2021 09:59:17 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r567298 - branches/2021Q1/lang/gcc9 X-SVN-Group: ports-branches X-SVN-Commit-Author: gerald X-SVN-Commit-Paths: branches/2021Q1/lang/gcc9 X-SVN-Commit-Revision: 567298 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Mar 2021 09:59:17 -0000 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}