From owner-svn-ports-head@freebsd.org Sat Sep 23 18:25:43 2017 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D3E8CE0C2A7; Sat, 23 Sep 2017 18:25:43 +0000 (UTC) (envelope-from gerald@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 9D9DA7F007; Sat, 23 Sep 2017 18:25:43 +0000 (UTC) (envelope-from gerald@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v8NIPgxu082911; Sat, 23 Sep 2017 18:25:42 GMT (envelope-from gerald@FreeBSD.org) Received: (from gerald@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v8NIPgEf082909; Sat, 23 Sep 2017 18:25:42 GMT (envelope-from gerald@FreeBSD.org) Message-Id: <201709231825.v8NIPgEf082909@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gerald set sender to gerald@FreeBSD.org using -f From: Gerald Pfeifer Date: Sat, 23 Sep 2017 18:25:42 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r450463 - head/lang/gcc6-aux X-SVN-Group: ports-head X-SVN-Commit-Author: gerald X-SVN-Commit-Paths: head/lang/gcc6-aux X-SVN-Commit-Revision: 450463 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 23 Sep 2017 18:25:43 -0000 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. 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