aboutsummaryrefslogtreecommitdiffstats
path: root/lang
diff options
context:
space:
mode:
authorGerald Pfeifer <gerald@FreeBSD.org>2020-10-31 06:42:54 +0800
committerGerald Pfeifer <gerald@FreeBSD.org>2020-10-31 06:42:54 +0800
commit5399fea276574d9c5e3c8a1de10464ffc9c22b68 (patch)
treea9bc47a3f275d2a39c24df9727df9a0c1ef9f43e /lang
parent3cb84e94e0fb6d9589ad7b7d470fd1a7796ec7ed (diff)
downloadfreebsd-ports-gnome-5399fea276574d9c5e3c8a1de10464ffc9c22b68.tar.gz
freebsd-ports-gnome-5399fea276574d9c5e3c8a1de10464ffc9c22b68.tar.zst
freebsd-ports-gnome-5399fea276574d9c5e3c8a1de10464ffc9c22b68.zip
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.
Diffstat (limited to 'lang')
-rw-r--r--lang/gcc48/Makefile15
-rw-r--r--lang/gcc48/pkg-plist3
2 files changed, 4 insertions, 14 deletions
diff --git a/lang/gcc48/Makefile b/lang/gcc48/Makefile
index a18e4371d76e..d4c73a3571d4 100644
--- a/lang/gcc48/Makefile
+++ b/lang/gcc48/Makefile
@@ -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}\///}
diff --git a/lang/gcc48/pkg-plist b/lang/gcc48/pkg-plist
index f1130554595e..907ce355b491 100644
--- a/lang/gcc48/pkg-plist
+++ b/lang/gcc48/pkg-plist
@@ -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