From owner-svn-ports-head@freebsd.org Tue Jul 21 10:40:26 2020 Return-Path: Delivered-To: svn-ports-head@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 E983A37E86D; Tue, 21 Jul 2020 10:40:26 +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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4B9w965wTHz4SJ4; Tue, 21 Jul 2020 10:40:26 +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 AE4B31CCB5; Tue, 21 Jul 2020 10:40:26 +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 06LAeQ4U069493; Tue, 21 Jul 2020 10:40:26 GMT (envelope-from gerald@FreeBSD.org) Received: (from gerald@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 06LAeQCq069492; Tue, 21 Jul 2020 10:40:26 GMT (envelope-from gerald@FreeBSD.org) Message-Id: <202007211040.06LAeQCq069492@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gerald set sender to gerald@FreeBSD.org using -f From: Gerald Pfeifer Date: Tue, 21 Jul 2020 10:40:26 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r542732 - in head/lang/gcc7: . files X-SVN-Group: ports-head X-SVN-Commit-Author: gerald X-SVN-Commit-Paths: in head/lang/gcc7: . files X-SVN-Commit-Revision: 542732 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 21 Jul 2020 10:40:27 -0000 Author: gerald Date: Tue Jul 21 10:40:26 2020 New Revision: 542732 URL: https://svnweb.freebsd.org/changeset/ports/542732 Log: This port covers an end-of-life version of GCC and is in the tree solely to support the devel/xtensa-esp32-elf port. Since that one now is limited to amd64 and i386, follow with our own ONLY_FOR_ARCHS setting. This simplifies this port a fair bit and avoids building on amd/aarch64 and powerpc* platforms. Deleted: head/lang/gcc7/files/patch-arm-unwind-cxx-support head/lang/gcc7/files/patch-spe-config Modified: head/lang/gcc7/Makefile Modified: head/lang/gcc7/Makefile ============================================================================== --- head/lang/gcc7/Makefile Tue Jul 21 09:18:58 2020 (r542731) +++ head/lang/gcc7/Makefile Tue Jul 21 10:40:26 2020 (r542732) @@ -14,7 +14,7 @@ LICENSE= GPLv3 GPLv3RLE LICENSE_COMB= multi DEPRECATED= Unsupported by upstream. Use GCC 9 or newer instead. -ONLY_FOR_ARCHS= aarch64 amd64 arm armv6 armv7 i386 powerpc powerpc64 powerpcspe sparc64 +ONLY_FOR_ARCHS= amd64 i386 LIB_DEPENDS= libgmp.so:math/gmp \ libmpfr.so:math/mpfr \ @@ -42,26 +42,10 @@ 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_powerpc64+= MULTILIB -OPTIONS_DEFAULT_powerpc64+= MULTILIB -MULTILIB_DESC= Build support for 32-bit and 64-bit targets -MULTILIB_CONFIGURE_ENABLE= multilib -.else -CONFIGURE_ARGS+= --disable-multilib -.endif - .include .if ${ARCH} == amd64 CONFIGURE_TARGET= x86_64-portbld-${OPSYS:tl}${OSREL} - -.elif ${ARCH} == powerpc64 -CONFIGURE_ENV+= UNAME_m="powerpc64" -MAKE_ARGS+= CFLAGS_FOR_TARGET="-O1" CXXFLAGS_FOR_TARGET="-O1" BOOT_CFLAGS="-O1" # PR235975 - -.elif ${ARCH} == powerpcspe -CONFIGURE_ARGS+= --with-cpu=8548 --enable-e500_double --without-fp .endif LANGUAGES:= c,c++,objc,fortran @@ -81,6 +65,7 @@ INSTALL_TARGET= install-strip BINMODE= 755 .endif CONFIGURE_ARGS+=--disable-nls \ + --disable-multilib \ --enable-gnu-indirect-function \ --libdir=${TARGLIB} \ --libexecdir=${LIBEXEC} \ @@ -135,11 +120,6 @@ post-stage: ${RM} -r ${STAGEDIR}${TARGLIB}/gcc/*/${GCC_VERSION}/include-fixed/ # Add target libraries and include files to packaging list. ${RM} ${WRKDIR}/PLIST.lib - -.if ${ARCH} == powerpc64 && ${PORT_OPTIONS:MMULTILIB} - ${MKDIR} ${STAGEDIR}${TARGLIB32} - ${MV} ${STAGEDIR}${PREFIX}/lib/lib32 ${STAGEDIR}${TARGLIB32}/gcc${SUFFIX} -.endif .for d in ${TARGLIB:S/^${PREFIX}\///} ${TARGLIB32:S/^${PREFIX}\///} ${LIBEXEC:S/^${PREFIX}\///} cd ${STAGEDIR}${PREFIX} ; if [ -d $d ]; then \