aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorolgeni <olgeni@FreeBSD.org>2017-01-02 21:24:46 +0800
committerolgeni <olgeni@FreeBSD.org>2017-01-02 21:24:46 +0800
commitc52e691d3afdd9b404e8f68464bb18ae11146ef8 (patch)
treec84740c0ac9de6e8d792e61eb731268af55c33c1
parente27119583fcfd977377d807405a08ec5c3a18f93 (diff)
downloadfreebsd-ports-gnome-c52e691d3afdd9b404e8f68464bb18ae11146ef8.tar.gz
freebsd-ports-gnome-c52e691d3afdd9b404e8f68464bb18ae11146ef8.tar.zst
freebsd-ports-gnome-c52e691d3afdd9b404e8f68464bb18ae11146ef8.zip
In Erlang 19 ports:
- Enable DTRACE by default where possible. - Remove unnecessary check for dtraceall module. PR: 215032 Submitted by: antoine
-rw-r--r--lang/erlang-runtime19/Makefile20
-rw-r--r--lang/erlang/Makefile20
2 files changed, 20 insertions, 20 deletions
diff --git a/lang/erlang-runtime19/Makefile b/lang/erlang-runtime19/Makefile
index 81679bb7181b..aaaecdbbb450 100644
--- a/lang/erlang-runtime19/Makefile
+++ b/lang/erlang-runtime19/Makefile
@@ -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
diff --git a/lang/erlang/Makefile b/lang/erlang/Makefile
index d4633f77c476..a5da0efa21c6 100644
--- a/lang/erlang/Makefile
+++ b/lang/erlang/Makefile
@@ -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