diff options
| author | Mark Linimon <linimon@FreeBSD.org> | 2018-03-31 11:22:24 +0000 |
|---|---|---|
| committer | Mark Linimon <linimon@FreeBSD.org> | 2018-03-31 11:22:24 +0000 |
| commit | a26698109d13faf432e7743890abf865ec53019a (patch) | |
| tree | 30243b711951dace834798ebea6134b9c0c0a336 | |
| parent | Add LICENSE. (diff) | |
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)
Notes
Notes:
svn path=/head/; revision=466038
| -rw-r--r-- | lang/erlang-runtime19/Makefile | 6 | ||||
| -rw-r--r-- | lang/erlang-runtime20/Makefile | 6 | ||||
| -rw-r--r-- | lang/erlang/Makefile | 6 |
3 files changed, 12 insertions, 6 deletions
diff --git a/lang/erlang-runtime19/Makefile b/lang/erlang-runtime19/Makefile index 94fa48af3be5..bae98cd40810 100644 --- a/lang/erlang-runtime19/Makefile +++ b/lang/erlang-runtime19/Makefile @@ -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 diff --git a/lang/erlang-runtime20/Makefile b/lang/erlang-runtime20/Makefile index c2ab901160d0..afd7a7295c44 100644 --- a/lang/erlang-runtime20/Makefile +++ b/lang/erlang-runtime20/Makefile @@ -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 diff --git a/lang/erlang/Makefile b/lang/erlang/Makefile index 5c4ab1ee70cf..ad820ca9cab5 100644 --- a/lang/erlang/Makefile +++ b/lang/erlang/Makefile @@ -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 |