From 42fcb4986989cd5f677b75bd126e98a2371820cc Mon Sep 17 00:00:00 2001 From: Mark Linimon Date: Sat, 17 Mar 2018 21:42:48 +0000 Subject: [PATCH] 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) --- lang/php70/Makefile | 11 ++++------- lang/php71/Makefile | 11 ++++------- lang/php72/Makefile | 11 ++++------- 3 files changed, 12 insertions(+), 21 deletions(-) diff --git a/lang/php70/Makefile b/lang/php70/Makefile index c1c16d9decff..e01fa203ca27 100644 --- a/lang/php70/Makefile +++ b/lang/php70/Makefile @@ -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 diff --git a/lang/php71/Makefile b/lang/php71/Makefile index 507870dc5272..8b67ca7e60aa 100644 --- a/lang/php71/Makefile +++ b/lang/php71/Makefile @@ -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 diff --git a/lang/php72/Makefile b/lang/php72/Makefile index 862fa09cfcfb..2f9bb2406a8c 100644 --- a/lang/php72/Makefile +++ b/lang/php72/Makefile @@ -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