svn commit: r450370 - head/lang/gcc48

[Gerald Pfeifer]

Author: gerald
Date: Fri Sep 22 13:05:17 2017
New Revision: 450370
URL: https://svnweb.freebsd.org/changeset/ports/450370

Log:
  Backport a number of changes from lang/gcc5 and lang/gcc49:
  
   - Move ONLY_FOR_ARCHS into the right position of the Makefile.
  
   - Omit a comment describing GCC_VERSION and SUFFIX.
  
   - Do not quote constant strings compared with ${ARCH}. [1]
  
   - Last, but not least the only functional change (and an important one):
     Remove headers being created by GCC's fixincludes machinery from
     the installation / packaging to avoid breakage when FreeBSD's headers
     are changing afterwards. [2]
  
  PR:		221905 [1], 222233 [2]
  Submitted by:	linimon [1]

Modified:
  head/lang/gcc48/Makefile

Modified: head/lang/gcc48/Makefile
==============================================================================
--- head/lang/gcc48/Makefile	Fri Sep 22 12:49:03 2017	(r450369)
+++ head/lang/gcc48/Makefile	Fri Sep 22 13:05:17 2017	(r450370)
@@ -3,7 +3,7 @@
 
 PORTNAME=	gcc
 PORTVERSION=	4.8.5
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	lang
 MASTER_SITES=	GCC/releases/gcc-${PORTVERSION}
 PKGNAMESUFFIX=	${SUFFIX}
@@ -14,6 +14,8 @@ COMMENT=	GNU Compiler Collection 4.8
 LICENSE=	GPLv3 GPLv3RLE
 LICENSE_COMB=	multi
 
+ONLY_FOR_ARCHS=	amd64 armv6 i386 powerpc powerpc64 sparc64
+
 LIB_DEPENDS=	libgmp.so:math/gmp \
 		libmpfr.so:math/mpfr \
 		libmpc.so:math/mpc
@@ -26,11 +28,8 @@ BUILD_DEPENDS+=	runtest:misc/dejagnu
 
 CPE_VENDOR=	gnu
 
-# GCC_VERSION and SUFFIX relate to names of executables and directories
-# once installed.
 GCC_VERSION=	${PORTVERSION}
 SUFFIX=		${PORTVERSION:C/([0-9]+).([0-9]+).*/\1\2/}
-ONLY_FOR_ARCHS=	amd64 armv6 i386 powerpc powerpc64 sparc64
 USES=		compiler cpe gmake iconv libtool makeinfo perl5 tar:bzip2
 USE_BINUTILS=	yes
 USE_PERL5=	build
@@ -51,7 +50,7 @@ CONFIGURE_ARGS+=	--disable-multilib
 
 .include <bsd.port.pre.mk>
 
-.if ${ARCH} == "amd64"
+.if ${ARCH} == amd64
 CONFIGURE_TARGET=	x86_64-portbld-${OPSYS:tl}${OSREL}
 .endif
 
@@ -59,7 +58,7 @@ CONFIGURE_TARGET=	x86_64-portbld-${OPSYS:tl}${OSREL}
 CONFIGURE_ENV+=	UNAME_m="powerpc64"
 .endif
 
-.if ${ARCH} == "armv6"
+.if ${ARCH} == armv6
 # Override sys.mk including -O in CFLAGS which breaks libgomp building.
 CFLAGS:=	${CFLAGS:S/-O/-O2/g}
 . if ${COMPILER_TYPE} == clang
@@ -128,6 +127,7 @@ full-regression-test: build
 
 post-stage:
 	${RM} ${STAGEDIR}${PREFIX}/man/man7/*
+	${RM} -r ${STAGEDIR}${TARGLIB}/gcc/*/${GCC_VERSION}/include-fixed/
 	# Add target libraries and include files to packaging list.
 	${RM} ${WRKDIR}/PLIST.lib
 .for d in ${TARGLIB:S/^${PREFIX}\///} ${LIBEXEC:S/^${PREFIX}\///}