Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 31 Mar 2018 11:22:25 +0000 (UTC)
From:      Mark Linimon <linimon@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r466038 - in head/lang: erlang erlang-runtime19 erlang-runtime20
Message-ID:  <201803311122.w2VBMP9P006955@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: linimon
Date: Sat Mar 31 11:22:24 2018
New Revision: 466038
URL: https://svnweb.freebsd.org/changeset/ports/466038

Log:
  Disable dtrace usdt on armvX to fix builds on those platforms (as was already
  done for aarch64).  Change is harmless on amd64.
  
  While here, sort OPTIONS.
  
  PR:		224271
  Submitted by:	mikael.urankar
  Approved by:	portmgr (tier-2 blanket)

Modified:
  head/lang/erlang-runtime19/Makefile
  head/lang/erlang-runtime20/Makefile
  head/lang/erlang/Makefile

Modified: head/lang/erlang-runtime19/Makefile
==============================================================================
--- head/lang/erlang-runtime19/Makefile	Sat Mar 31 10:08:17 2018	(r466037)
+++ head/lang/erlang-runtime19/Makefile	Sat Mar 31 11:22:24 2018	(r466038)
@@ -56,16 +56,18 @@ WX_DESC=	Enable WX application
 NATIVE_IMPLIES=	HIPE
 
 OPTIONS_DEFAULT=HIPE KQUEUE OPENSSL SCTP SMP THREADS DTRACE
-OPTIONS_EXCLUDE_DragonFly=	HIPE NATIVE SCTP
 
 .if !exists(/usr/sbin/dtrace)
 OPTIONS_EXCLUDE+=	DTRACE
 .endif
 
+OPTIONS_EXCLUDE_DragonFly=	HIPE NATIVE SCTP
 OPTIONS_EXCLUDE_FreeBSD_10=	DTRACE
-OPTIONS_EXCLUDE_i386=		DTRACE
 # ld(1) fails to link probes: missing __dtrace_erlang___* symbols
 OPTIONS_EXCLUDE_aarch64=	DTRACE
+OPTIONS_EXCLUDE_armv6=		DTRACE
+OPTIONS_EXCLUDE_armv7=		DTRACE
+OPTIONS_EXCLUDE_i386=		DTRACE
 
 OPENSSL_VARS=	BROKEN_SSL=openssl-devel
 

Modified: head/lang/erlang-runtime20/Makefile
==============================================================================
--- head/lang/erlang-runtime20/Makefile	Sat Mar 31 10:08:17 2018	(r466037)
+++ head/lang/erlang-runtime20/Makefile	Sat Mar 31 11:22:24 2018	(r466038)
@@ -52,16 +52,18 @@ WX_DESC=	Enable WX application
 NATIVE_IMPLIES=	HIPE
 
 OPTIONS_DEFAULT=HIPE KQUEUE OPENSSL SCTP SMP THREADS DTRACE
-OPTIONS_EXCLUDE_DragonFly=	HIPE NATIVE SCTP
 
 .if !exists(/usr/sbin/dtrace)
 OPTIONS_EXCLUDE+=	DTRACE
 .endif
 
+OPTIONS_EXCLUDE_DragonFly=	HIPE NATIVE SCTP
 OPTIONS_EXCLUDE_FreeBSD_10=	DTRACE
-OPTIONS_EXCLUDE_i386=		DTRACE
 # ld(1) fails to link probes: missing __dtrace_erlang___* symbols
 OPTIONS_EXCLUDE_aarch64=	DTRACE
+OPTIONS_EXCLUDE_armv6=		DTRACE
+OPTIONS_EXCLUDE_armv7=		DTRACE
+OPTIONS_EXCLUDE_i386=		DTRACE
 
 ERL_RELEASE=	20.3
 

Modified: head/lang/erlang/Makefile
==============================================================================
--- head/lang/erlang/Makefile	Sat Mar 31 10:08:17 2018	(r466037)
+++ head/lang/erlang/Makefile	Sat Mar 31 11:22:24 2018	(r466038)
@@ -60,16 +60,18 @@ WX_DESC=	Enable WX application
 NATIVE_IMPLIES=	HIPE
 
 OPTIONS_DEFAULT=HIPE KQUEUE OPENSSL SCTP SMP THREADS DTRACE
-OPTIONS_EXCLUDE_DragonFly=	HIPE NATIVE SCTP
 
 .if !exists(/usr/sbin/dtrace)
 OPTIONS_EXCLUDE+=	DTRACE
 .endif
 
+OPTIONS_EXCLUDE_DragonFly=	HIPE NATIVE SCTP
 OPTIONS_EXCLUDE_FreeBSD_10=	DTRACE
-OPTIONS_EXCLUDE_i386=		DTRACE
 # ld(1) fails to link probes: missing __dtrace_erlang___* symbols
 OPTIONS_EXCLUDE_aarch64=	DTRACE
+OPTIONS_EXCLUDE_armv6=		DTRACE
+OPTIONS_EXCLUDE_armv7=		DTRACE
+OPTIONS_EXCLUDE_i386=		DTRACE
 
 OPENSSL_VARS=	BROKEN_SSL=openssl-devel
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201803311122.w2VBMP9P006955>