svn commit: r464849 - in head/lang: php70 php71 php72

[Mark Linimon]

Author: linimon
Date: Sat Mar 17 21:42:48 2018
New Revision: 464849
URL: https://svnweb.freebsd.org/changeset/ports/464849

Log:
  Turn off DTRACE option by default for mips.  It fails the exact same way
  that armvX do.
  
  While here, remove duplicate OPTIONS_EXCLUDE_aarch64 line, and sort.
  
  Approved by:	portmgr (tier-2 blanket)

Modified:
  head/lang/php70/Makefile
  head/lang/php71/Makefile
  head/lang/php72/Makefile

Modified: head/lang/php70/Makefile
==============================================================================
--- head/lang/php70/Makefile	Sat Mar 17 21:24:41 2018	(r464848)
+++ head/lang/php70/Makefile	Sat Mar 17 21:42:48 2018	(r464849)
@@ -33,20 +33,17 @@ USE_GNOME=	libxml2
 
 OPTIONS_DEFINE+=CLI CGI FPM EMBED PHPDBG DEBUG DTRACE IPV6 MAILHEAD LINKTHR ZTS
 OPTIONS_DEFAULT=CLI CGI FPM EMBED LINKTHR DTRACE
+OPTIONS_EXCLUDE_DragonFly=	DTRACE
 # ld(1) fails to link probes: Relocations in generic ELF (EM: 0)
 OPTIONS_EXCLUDE_aarch64=	DTRACE
 # dt_modtext:opensolaris/ib/libdtrace/common/dt_link.c: arm not impemented
 OPTIONS_EXCLUDE_armv6=		DTRACE
 OPTIONS_EXCLUDE_armv7=		DTRACE
 # Bug 197128:  No ASM code for MIPS/MIPS64, disable FPM
-OPTIONS_EXCLUDE_mips=		FPM
-OPTIONS_EXCLUDE_mips64=		FPM
-OPTIONS_SUB=	yes
-
-OPTIONS_EXCLUDE_DragonFly=	DTRACE
-# ld(1) fails to link probes: Relocations in generic ELF (EM: 0)
-OPTIONS_EXCLUDE_aarch64=	DTRACE
+OPTIONS_EXCLUDE_mips=		DTRACE FPM
+OPTIONS_EXCLUDE_mips64=		DTRACE FPM
 OPTIONS_EXCLUDE_sparc64=	DTRACE
+OPTIONS_SUB=	yes
 
 CLI_DESC=	Build CLI version
 CGI_DESC=	Build CGI version

Modified: head/lang/php71/Makefile
==============================================================================
--- head/lang/php71/Makefile	Sat Mar 17 21:24:41 2018	(r464848)
+++ head/lang/php71/Makefile	Sat Mar 17 21:42:48 2018	(r464849)
@@ -34,20 +34,17 @@ USE_GNOME=	libxml2
 
 OPTIONS_DEFINE+=CLI CGI FPM EMBED PHPDBG DEBUG DTRACE IPV6 MAILHEAD LINKTHR ZTS
 OPTIONS_DEFAULT=CLI CGI FPM EMBED LINKTHR DTRACE
+OPTIONS_EXCLUDE_DragonFly=	DTRACE
 # ld(1) fails to link probes: Relocations in generic ELF (EM: 0)
 OPTIONS_EXCLUDE_aarch64=	DTRACE
 # dt_modtext:opensolaris/ib/libdtrace/common/dt_link.c: arm not impemented
 OPTIONS_EXCLUDE_armv6=		DTRACE
 OPTIONS_EXCLUDE_armv7=		DTRACE
 # Bug 197128:  No ASM code for MIPS/MIPS64, disable FPM
-OPTIONS_EXCLUDE_mips=		FPM
-OPTIONS_EXCLUDE_mips64=		FPM
-OPTIONS_SUB=	yes
-
-OPTIONS_EXCLUDE_DragonFly=	DTRACE
-# ld(1) fails to link probes: Relocations in generic ELF (EM: 0)
-OPTIONS_EXCLUDE_aarch64=	DTRACE
+OPTIONS_EXCLUDE_mips=		DTRACE FPM
+OPTIONS_EXCLUDE_mips64=		DTRACE FPM
 OPTIONS_EXCLUDE_sparc64=	DTRACE
+OPTIONS_SUB=	yes
 
 CLI_DESC=	Build CLI version
 CGI_DESC=	Build CGI version

Modified: head/lang/php72/Makefile
==============================================================================
--- head/lang/php72/Makefile	Sat Mar 17 21:24:41 2018	(r464848)
+++ head/lang/php72/Makefile	Sat Mar 17 21:42:48 2018	(r464849)
@@ -35,20 +35,17 @@ USE_GNOME=	libxml2
 
 OPTIONS_DEFINE+=CLI CGI FPM EMBED PHPDBG DEBUG DTRACE IPV6 LINKTHR ZTS
 OPTIONS_DEFAULT=CLI CGI FPM EMBED LINKTHR DTRACE
+OPTIONS_EXCLUDE_DragonFly=	DTRACE
 # ld(1) fails to link probes: Relocations in generic ELF (EM: 0)
 OPTIONS_EXCLUDE_aarch64=	DTRACE
 # dt_modtext:opensolaris/ib/libdtrace/common/dt_link.c: arm not impemented
 OPTIONS_EXCLUDE_armv6=		DTRACE
 OPTIONS_EXCLUDE_armv7=		DTRACE
 # Bug 197128:  No ASM code for MIPS/MIPS64, disable FPM
-OPTIONS_EXCLUDE_mips=		FPM
-OPTIONS_EXCLUDE_mips64=		FPM
-OPTIONS_SUB=	yes
-
-OPTIONS_EXCLUDE_DragonFly=	DTRACE
-# ld(1) fails to link probes: Relocations in generic ELF (EM: 0)
-OPTIONS_EXCLUDE_aarch64=	DTRACE
+OPTIONS_EXCLUDE_mips=		DTRACE FPM
+OPTIONS_EXCLUDE_mips64=		DTRACE FPM
 OPTIONS_EXCLUDE_sparc64=	DTRACE
+OPTIONS_SUB=	yes
 
 CLI_DESC=	Build CLI version
 CGI_DESC=	Build CGI version