Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 23 Sep 2017 18:25:42 +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: r450463 - head/lang/gcc6-aux
Message-ID:  <201709231825.v8NIPgEf082909@repo.freebsd.org>

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

Log:
  Always remove headers being created by GCC's fixincludes machinery from
  the installation / packaging, not just when bootstrapping GCC (with option
  BOOTSTRAP on).  This avoids breakage when FreeBSD's headers are changing
  after the build.
  
  PR:		221111
  Submitted by:	David Z. <daz@hyperchronos.org>

Modified:
  head/lang/gcc6-aux/Makefile
  head/lang/gcc6-aux/Makefile.version

Modified: head/lang/gcc6-aux/Makefile
==============================================================================
--- head/lang/gcc6-aux/Makefile	Sat Sep 23 18:11:50 2017	(r450462)
+++ head/lang/gcc6-aux/Makefile	Sat Sep 23 18:25:42 2017	(r450463)
@@ -267,6 +267,7 @@ do-install:
 		${STAGEDIR}${PREFIX}/share/dejagnu/baseboards
 
 post-stage:
+	${RM} -r ${STAGEDIR}${PKG_PREFIX}/lib/gcc/${BLD_TARGET}/${GCC_VERSION}/include-fixed/
 	(cd ${STAGEDIR}${PKG_PREFIX}; ${FIND} * -type d -empty | \
 		${SORT} -dr | ${XARGS} ${RMDIR})
 	(cd ${STAGEDIR}${PREFIX}; ${FIND} ${PORTNAME} share \
@@ -279,7 +280,6 @@ post-stage:
 	${CP} -a ${STAGEDIR}${PKG_PREFIX}/include ${NEWBSDIR}/
 	${CP} -a ${STAGEDIR}${PKG_PREFIX}/libexec ${NEWBSDIR}/
 	${RM} ${NEWBSDIR}/bin/${GARCH}*
-	${RM} -r ${NEWBSDIR}/lib/gcc/${BLD_TARGET}/${GCC_VERSION}/include-fixed
 	(cd ${NEWBSDIR}/.. ; ${TAR} -cyf ${BSFILENAME} bootstrap)
 .endif
 

Modified: head/lang/gcc6-aux/Makefile.version
==============================================================================
--- head/lang/gcc6-aux/Makefile.version	Sat Sep 23 18:11:50 2017	(r450462)
+++ head/lang/gcc6-aux/Makefile.version	Sat Sep 23 18:25:42 2017	(r450463)
@@ -5,7 +5,7 @@ GCC_POINT=		3.1
 GCC_VERSION=		${GCC_BRANCH}.${GCC_POINT}
 SNAPSHOT=		20170202
 BUILD_RELEASE=		no
-MAIN_PR=		1
+MAIN_PR=		2
 UTIL_PR=		0
 ARMV7_PR=		1
 ARM64_PR=		2



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