Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 2 Jan 2017 13:24:46 +0000 (UTC)
From:      Jimmy Olgeni <olgeni@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r430355 - in head/lang: erlang erlang-runtime19
Message-ID:  <201701021324.v02DOkom002681@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: olgeni
Date: Mon Jan  2 13:24:46 2017
New Revision: 430355
URL: https://svnweb.freebsd.org/changeset/ports/430355

Log:
  In Erlang 19 ports:
  
  - Enable DTRACE by default where possible.
  - Remove unnecessary check for dtraceall module.
  
  PR:		215032
  Submitted by:	antoine

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

Modified: head/lang/erlang-runtime19/Makefile
==============================================================================
--- head/lang/erlang-runtime19/Makefile	Mon Jan  2 13:04:39 2017	(r430354)
+++ head/lang/erlang-runtime19/Makefile	Mon Jan  2 13:24:46 2017	(r430355)
@@ -3,7 +3,7 @@
 
 PORTNAME=	erlang
 PORTVERSION=	19.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	lang parallel java
 MASTER_SITES=	http://www.erlang.org/download/:erlangorg		\
 		http://erlang.stacken.kth.se/download/:erlangorg	\
@@ -49,9 +49,17 @@ WX_DESC=	Enable WX application
 
 NATIVE_IMPLIES=	HIPE
 
-OPTIONS_DEFAULT=HIPE KQUEUE OPENSSL SCTP SMP THREADS
+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_FreeBSD_9=	DTRACE
+OPTIONS_EXCLUDE_FreeBSD_10=	DTRACE
+OPTIONS_EXCLUDE_i386=		DTRACE
+
 ERL_RELEASE=	19.2
 
 USES=		gmake ncurses perl5
@@ -185,14 +193,6 @@ MAKE_ARGS+=	ARCH=arm
 # links in the documentation.
 
 pre-configure:
-.if ${PORT_OPTIONS:MDTRACE}
-	@if ! /sbin/kldstat | ${GREP} dtraceall >/dev/null 2>&1; then \
-		${ECHO_CMD}; \
-		${ECHO_CMD} "DTRACE option requires kernel module \"dtraceall\" to be loaded."; \
-		${ECHO_CMD}; \
-		exit 1; \
-	fi
-.endif
 .if ! ${PORT_OPTIONS:MWX}
 	echo "disabled by port options" > ${WRKSRC}/lib/wx/SKIP
 .endif

Modified: head/lang/erlang/Makefile
==============================================================================
--- head/lang/erlang/Makefile	Mon Jan  2 13:04:39 2017	(r430354)
+++ head/lang/erlang/Makefile	Mon Jan  2 13:24:46 2017	(r430355)
@@ -3,7 +3,7 @@
 
 PORTNAME=	erlang
 PORTVERSION=	19.2
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	3
 CATEGORIES=	lang parallel java
 MASTER_SITES=	http://www.erlang.org/download/:erlangorg		\
@@ -54,9 +54,17 @@ WX_DESC=	Enable WX application
 
 NATIVE_IMPLIES=	HIPE
 
-OPTIONS_DEFAULT=HIPE KQUEUE OPENSSL SCTP SMP THREADS
+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_FreeBSD_9=	DTRACE
+OPTIONS_EXCLUDE_FreeBSD_10=	DTRACE
+OPTIONS_EXCLUDE_i386=		DTRACE
+
 ERL_RELEASE=	19.2
 
 USES=		gmake ncurses perl5
@@ -205,14 +213,6 @@ post-patch:
 	@${ECHO_CMD} "MANPATH ${PREFIX}/lib/erlang/man" > ${WRKDIR}/erlang.conf
 
 pre-configure:
-.if ${PORT_OPTIONS:MDTRACE}
-	@if ! /sbin/kldstat | ${GREP} dtraceall >/dev/null 2>&1; then \
-		${ECHO_CMD}; \
-		${ECHO_CMD} "DTRACE option requires kernel module \"dtraceall\" to be loaded."; \
-		${ECHO_CMD}; \
-		exit 1; \
-	fi
-.endif
 .if ! ${PORT_OPTIONS:MWX}
 	echo "disabled by port options" > ${WRKSRC}/lib/wx/SKIP
 .endif



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