Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 30 Oct 2020 22:42:55 +0000 (UTC)
From:      Gerald Pfeifer <gerald@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r553716 - head/lang/gcc48
Message-ID:  <202010302242.09UMgtsa081224@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: gerald
Date: Fri Oct 30 22:42:54 2020
New Revision: 553716
URL: https://svnweb.freebsd.org/changeset/ports/553716

Log:
  Backport r553560 | gerald | 2020-10-28 from lang/gcc7:
  
    Our only [two consumers] in the tree [do] not require Fortran nor
    Objective-C, so do not build those front ends and libraries any longer.
  
    Also remove the BOOTSTRAP option, which has been the default all along,
    and bootstrap unconditionally, further simplifying this port.

Modified:
  head/lang/gcc48/Makefile
  head/lang/gcc48/pkg-plist

Modified: head/lang/gcc48/Makefile
==============================================================================
--- head/lang/gcc48/Makefile	Fri Oct 30 21:56:56 2020	(r553715)
+++ head/lang/gcc48/Makefile	Fri Oct 30 22:42:54 2020	(r553716)
@@ -3,7 +3,7 @@
 
 PORTNAME=	gcc
 PORTVERSION=	4.8.5
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	lang
 MASTER_SITES=	GCC
 PKGNAMESUFFIX=	${SUFFIX}
@@ -38,27 +38,19 @@ SSP_UNSAFE=	yes
 CFLAGS:=	${CFLAGS:N-march=ivybridge:N-march=westmere:N-mretpoline}
 CXXFLAGS:=	${CXXFLAGS:N-march=ivybridge:N-march=westmere:N-mretpoline}
 
-OPTIONS_DEFINE=		BOOTSTRAP
-OPTIONS_DEFAULT=	BOOTSTRAP
-BOOTSTRAP_DESC=		Build using a full bootstrap
-
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == amd64
 CONFIGURE_TARGET=	x86_64-portbld-${OPSYS:tl}${OSREL}
 .endif
 
-LANGUAGES:=	c,c++,objc,fortran
+LANGUAGES:=	c,c++
 TARGLIB=	${PREFIX}/lib/gcc${SUFFIX}
 LIBEXEC=	${PREFIX}/libexec/gcc${SUFFIX}
 GNU_CONFIGURE=	yes
 CONFIGURE_OUTSOURCE=	yes
-.if empty(PORT_OPTIONS:MBOOTSTRAP)
-CONFIGURE_ARGS+=--disable-bootstrap
-.else
 CONFIGURE_ARGS+=--with-build-config=bootstrap-debug
 ALL_TARGET=	bootstrap-lean
-.endif
 INSTALL_TARGET=	install-strip
 .if ${UID} != 0
 BINMODE=	755
@@ -115,7 +107,8 @@ full-regression-test: build
 
 post-stage:
 	${RM} ${STAGEDIR}${PREFIX}/man/man7/*
-	${RM} -r ${STAGEDIR}${TARGLIB}/gcc/*/${GCC_VERSION}/include-fixed/
+	${RM} -r ${STAGEDIR}${TARGLIB}/gcc/*/${GCC_VERSION}/include-fixed/ \
+	         ${STAGEDIR}${TARGLIB}/gcc/*/${GCC_VERSION}/finclude
 	# Add target libraries and include files to packaging list.
 	${RM} ${WRKDIR}/PLIST.lib
 .for d in ${TARGLIB:S/^${PREFIX}\///} ${LIBEXEC:S/^${PREFIX}\///}

Modified: head/lang/gcc48/pkg-plist
==============================================================================
--- head/lang/gcc48/pkg-plist	Fri Oct 30 21:56:56 2020	(r553715)
+++ head/lang/gcc48/pkg-plist	Fri Oct 30 22:42:54 2020	(r553716)
@@ -5,7 +5,6 @@ bin/%%GNU_HOST%%-gcc-%%GCC_VERSION%%
 bin/%%GNU_HOST%%-gcc-ar%%SUFFIX%%
 bin/%%GNU_HOST%%-gcc-nm%%SUFFIX%%
 bin/%%GNU_HOST%%-gcc-ranlib%%SUFFIX%%
-bin/%%GNU_HOST%%-gfortran%%SUFFIX%%
 bin/c++%%SUFFIX%%
 bin/cpp%%SUFFIX%%
 bin/g++%%SUFFIX%%
@@ -14,12 +13,10 @@ bin/gcc-ar%%SUFFIX%%
 bin/gcc-nm%%SUFFIX%%
 bin/gcc-ranlib%%SUFFIX%%
 bin/gcov%%SUFFIX%%
-bin/gfortran%%SUFFIX%%
 man/man1/cpp%%SUFFIX%%.1.gz
 man/man1/g++%%SUFFIX%%.1.gz
 man/man1/gcc%%SUFFIX%%.1.gz
 man/man1/gcov%%SUFFIX%%.1.gz
-man/man1/gfortran%%SUFFIX%%.1.gz
 share/gcc-%%GCC_VERSION%%/python/libstdcxx/__init__.py
 share/gcc-%%GCC_VERSION%%/python/libstdcxx/v6/__init__.py
 share/gcc-%%GCC_VERSION%%/python/libstdcxx/v6/printers.py



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