svn commit: r420820 - in head/lang: gcc gcc48 gcc5

[Gerald Pfeifer]

Author: gerald
Date: Wed Aug 24 20:05:40 2016
New Revision: 420820
URL: https://svnweb.freebsd.org/changeset/ports/420820

Log:
  Default powerpc64 to bootstrapping (option BOOTSTRAP) since otherwise
  GCC can be mis-built, leading to an internal compiler error building
  libgcc/libgcov.c, at least on FreeBSD 11.
  
  Adjust OPTIONS_DEFINE_powerpc64 and OPTIONS_DEFAULT_powerpc64
  incrementally (with +=) to avoid overwriting settings defined
  at the top of the Makefile (or child ports). [1]
  
  Submitted by:	swills [1]
  Reported by:	swills

Modified:
  head/lang/gcc/Makefile
  head/lang/gcc48/Makefile
  head/lang/gcc5/Makefile

Modified: head/lang/gcc/Makefile
==============================================================================
--- head/lang/gcc/Makefile	Wed Aug 24 19:48:28 2016	(r420819)
+++ head/lang/gcc/Makefile	Wed Aug 24 20:05:40 2016	(r420820)
@@ -42,12 +42,13 @@ OPTIONS_DEFINE_i386=	JAVA
 OPTIONS_DEFINE_amd64=	JAVA
 OPTIONS_DEFAULT_i386=	JAVA
 OPTIONS_DEFAULT_amd64=	JAVA
+OPTIONS_DEFAULT_powerpc64=	BOOTSTRAP
 OPTIONS_EXCLUDE_DragonFly=	JAVA
 BOOTSTRAP_DESC=		Build using a full bootstrap
 
 .if exists(/usr/lib32/libc.so)
-OPTIONS_DEFINE_powerpc64=	MULTILIB
-OPTIONS_DEFAULT_powerpc64=	MULTILIB
+OPTIONS_DEFINE_powerpc64+=	MULTILIB
+OPTIONS_DEFAULT_powerpc64+=	MULTILIB
 MULTILIB_DESC=		Build support for 32-bit and 64-bit targets
 MULTILIB_CONFIGURE_ENABLE=	multilib
 .else

Modified: head/lang/gcc48/Makefile
==============================================================================
--- head/lang/gcc48/Makefile	Wed Aug 24 19:48:28 2016	(r420819)
+++ head/lang/gcc48/Makefile	Wed Aug 24 20:05:40 2016	(r420820)
@@ -45,12 +45,13 @@ OPTIONS_DEFINE_amd64=	JAVA
 OPTIONS_DEFAULT=	BOOTSTRAP
 OPTIONS_DEFAULT_i386=	JAVA
 OPTIONS_DEFAULT_amd64=	JAVA
+OPTIONS_DEFAULT_powerpc64=	BOOTSTRAP
 OPTIONS_EXCLUDE_DragonFly=	JAVA
 BOOTSTRAP_DESC=		Build using a full bootstrap
 
 .if exists(/usr/lib32/libc.so)
-OPTIONS_DEFINE_powerpc64=	MULTILIB
-OPTIONS_DEFAULT_powerpc64=	MULTILIB
+OPTIONS_DEFINE_powerpc64+=	MULTILIB
+OPTIONS_DEFAULT_powerpc64+=	MULTILIB
 MULTILIB_DESC=		Build support for 32-bit and 64-bit targets
 MULTILIB_CONFIGURE_ENABLE=	multilib
 .else

Modified: head/lang/gcc5/Makefile
==============================================================================
--- head/lang/gcc5/Makefile	Wed Aug 24 19:48:28 2016	(r420819)
+++ head/lang/gcc5/Makefile	Wed Aug 24 20:05:40 2016	(r420820)
@@ -50,8 +50,8 @@ BOOTSTRAP_DESC=		Build using a full boot
 GRAPHITE_DESC=		Support for Graphite loop optimizations
 
 .if exists(/usr/lib32/libc.so)
-OPTIONS_DEFINE_powerpc64=	MULTILIB
-OPTIONS_DEFAULT_powerpc64=	MULTILIB
+OPTIONS_DEFINE_powerpc64+=	MULTILIB
+OPTIONS_DEFAULT_powerpc64+=	MULTILIB
 MULTILIB_DESC=		Build support for 32-bit and 64-bit targets
 MULTILIB_CONFIGURE_ENABLE=	multilib
 .else