svn commit: r450463 - head/lang/gcc6-aux
Gerald Pfeifer
gerald at FreeBSD.org
Sat Sep 23 18:25:43 UTC 2017
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 at 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
More information about the svn-ports-all
mailing list