Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 23 Sep 2017 19:23:16 +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: r450467 - head/lang/gcc47
Message-ID:  <201709231923.v8NJNGgh007498@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: gerald
Date: Sat Sep 23 19:23:16 2017
New Revision: 450467
URL: https://svnweb.freebsd.org/changeset/ports/450467

Log:
  Backport several cleanups and one real fix from lang/gcc5:
  
   - 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
     at that): Remove headers being created by GCC's fixincludes machinery
     from the installation / packaging to avoid breakage when FreeBSD's
     headers are changing afterwards.
  
   - On the way, add a TIMESTAMP to distinfo.
  
  PR:		221905 [1]
  Submitted by:	linimon [1]

Modified:
  head/lang/gcc47/Makefile
  head/lang/gcc47/distinfo

Modified: head/lang/gcc47/Makefile
==============================================================================
--- head/lang/gcc47/Makefile	Sat Sep 23 19:19:54 2017	(r450466)
+++ head/lang/gcc47/Makefile	Sat Sep 23 19:23:16 2017	(r450467)
@@ -3,7 +3,7 @@
 
 PORTNAME=	gcc
 PORTVERSION=	4.7.4
-PORTREVISION=	5
+PORTREVISION=	6
 PORTEPOCH=	1
 CATEGORIES=	lang
 MASTER_SITES=	GCC/releases/gcc-${PORTVERSION}
@@ -15,6 +15,8 @@ COMMENT=	GNU Compiler Collection 4.7
 LICENSE=	GPLv3 GPLv3RLE
 LICENSE_COMB=	multi
 
+ONLY_FOR_ARCHS=	amd64 i386 powerpc sparc64
+
 LIB_DEPENDS=	libgmp.so:math/gmp \
 		libmpfr.so:math/mpfr \
 		libmpc.so:math/mpc
@@ -27,11 +29,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 i386 powerpc sparc64
 USES=		cpe gmake iconv libtool makeinfo perl5 tar:bzip2
 USE_BINUTILS=	yes
 USE_PERL5=	build
@@ -42,7 +41,7 @@ BOOTSTRAP_DESC=		Build using a full bootstrap
 
 .include <bsd.port.pre.mk>
 
-.if ${ARCH} == "amd64"
+.if ${ARCH} == amd64
 CONFIGURE_TARGET=	x86_64-portbld-${OPSYS:tl}${OSREL}
 .endif
 
@@ -107,6 +106,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}\///}

Modified: head/lang/gcc47/distinfo
==============================================================================
--- head/lang/gcc47/distinfo	Sat Sep 23 19:19:54 2017	(r450466)
+++ head/lang/gcc47/distinfo	Sat Sep 23 19:23:16 2017	(r450467)
@@ -1,2 +1,3 @@
+TIMESTAMP = 1506192525
 SHA256 (gcc-4.7.4.tar.bz2) = 92e61c6dc3a0a449e62d72a38185fda550168a86702dea07125ebd3ec3996282
 SIZE (gcc-4.7.4.tar.bz2) = 82935453



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