diff options
author | jperkin <jperkin@pkgsrc.org> | 2015-02-19 11:56:18 +0000 |
---|---|---|
committer | jperkin <jperkin@pkgsrc.org> | 2015-02-19 11:56:18 +0000 |
commit | 537a2d68fc6eae66a1c48752387b1d72f31ea9dc (patch) | |
tree | fef64a7dd739bbce5d0cfe0a801bacb576e48acb /lang/erlang | |
parent | 79730ca9fb2f93cf29d58d9624c83177cbd7e890 (diff) | |
download | pkgsrc-537a2d68fc6eae66a1c48752387b1d72f31ea9dc.tar.gz |
Fix build with DTrace 1.11 and newer which is more strict about objects
with no probes enabled.
Bump PKGREVISION.
Diffstat (limited to 'lang/erlang')
-rw-r--r-- | lang/erlang/Makefile | 4 | ||||
-rw-r--r-- | lang/erlang/PLIST | 3 | ||||
-rw-r--r-- | lang/erlang/distinfo | 4 | ||||
-rw-r--r-- | lang/erlang/patches/patch-erts_configure | 16 | ||||
-rw-r--r-- | lang/erlang/patches/patch-lib_runtime__tools_c__src_Makefile.in | 15 |
5 files changed, 37 insertions, 5 deletions
diff --git a/lang/erlang/Makefile b/lang/erlang/Makefile index a678cc27302..c51fd487e1b 100644 --- a/lang/erlang/Makefile +++ b/lang/erlang/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.63 2015/02/11 15:11:48 is Exp $ +# $NetBSD: Makefile,v 1.64 2015/02/19 11:56:18 jperkin Exp $ DISTNAME= otp_src_${DIST_VERSION_MAJOR}${DIST_VERSION_MINOR:D-${DIST_VERSION_MINOR}} -PKGREVISION= 3 +PKGREVISION= 4 PKGNAME= erlang-${ERLANG_VERSION} CATEGORIES= lang MASTER_SITES= http://www.erlang.org/download/ diff --git a/lang/erlang/PLIST b/lang/erlang/PLIST index 8dab3d1995d..d9d17368f77 100644 --- a/lang/erlang/PLIST +++ b/lang/erlang/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.15 2013/10/20 18:37:49 asau Exp $ +@comment $NetBSD: PLIST,v 1.16 2015/02/19 11:56:18 jperkin Exp $ bin/ct_run bin/dialyzer bin/epmd @@ -3413,7 +3413,6 @@ lib/erlang/lib/runtime_tools-${VERSION.runtime_tools}/include/observer_backend.h lib/erlang/lib/runtime_tools-${VERSION.runtime_tools}/priv/lib/dyntrace.so lib/erlang/lib/runtime_tools-${VERSION.runtime_tools}/priv/lib/trace_file_drv.so lib/erlang/lib/runtime_tools-${VERSION.runtime_tools}/priv/lib/trace_ip_drv.so -${PLIST.dtrace}lib/erlang/lib/runtime_tools-${VERSION.runtime_tools}/priv/obj/dtrace_user.o lib/erlang/lib/runtime_tools-${VERSION.runtime_tools}/priv/obj/dyntrace.o lib/erlang/lib/runtime_tools-${VERSION.runtime_tools}/src/appmon_info.erl lib/erlang/lib/runtime_tools-${VERSION.runtime_tools}/src/dbg.erl diff --git a/lang/erlang/distinfo b/lang/erlang/distinfo index e231728d3e7..8f9620ac2f6 100644 --- a/lang/erlang/distinfo +++ b/lang/erlang/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.33 2013/10/20 18:37:49 asau Exp $ +$NetBSD: distinfo,v 1.34 2015/02/19 11:56:18 jperkin Exp $ SHA1 (erlang/otp_src_R16B02.tar.gz) = 16accc21afaebf2bd9507c5a2610aecf8d6f8243 RMD160 (erlang/otp_src_R16B02.tar.gz) = d10ad82b3bddf16d1cf52babd56965537b64faeb @@ -10,3 +10,5 @@ SHA1 (patch-ao) = a4ee17b0a81415d541cb55d76b3c1ecc3148c2c2 SHA1 (patch-ay) = 7d1a7f79e8c3ea909b2f4476d9ff271ed1318234 SHA1 (patch-configure) = 8bf08197747cbca07fcb7edba6782389787d7a1f SHA1 (patch-configure.in) = 4a36245a6a6b6dc4804cbb899c7e824ec1fe61e0 +SHA1 (patch-erts_configure) = 614bfdc28c7dea8a34a3ae4e00ac976fa83e81e2 +SHA1 (patch-lib_runtime__tools_c__src_Makefile.in) = b7fe63a8d07612464034303cf41d97e1ea701883 diff --git a/lang/erlang/patches/patch-erts_configure b/lang/erlang/patches/patch-erts_configure new file mode 100644 index 00000000000..3e21eef373a --- /dev/null +++ b/lang/erlang/patches/patch-erts_configure @@ -0,0 +1,16 @@ +$NetBSD: patch-erts_configure,v 1.1 2015/02/19 11:56:18 jperkin Exp $ + +Fix for DTrace 1.11 and newer. + +--- erts/configure.orig 2013-09-16 18:12:18.000000000 +0000 ++++ erts/configure +@@ -37343,6 +37343,9 @@ echo "$as_me: error: Could not precompil + { echo "$as_me:$LINENO: dtrace precompilation for 2-stage DTrace successful" >&5 + echo "$as_me: dtrace precompilation for 2-stage DTrace successful" >&6;} + else ++ case `dtrace -V 2>/dev/null` in ++ *"Sun D "1.1[1-9]*) DTRACE_ENABLED_2STEP=yes;; ++ esac + { echo "$as_me:$LINENO: dtrace precompilation for 1-stage DTrace successful" >&5 + echo "$as_me: dtrace precompilation for 1-stage DTrace successful" >&6;} + fi diff --git a/lang/erlang/patches/patch-lib_runtime__tools_c__src_Makefile.in b/lang/erlang/patches/patch-lib_runtime__tools_c__src_Makefile.in new file mode 100644 index 00000000000..177655c16e4 --- /dev/null +++ b/lang/erlang/patches/patch-lib_runtime__tools_c__src_Makefile.in @@ -0,0 +1,15 @@ +$NetBSD: patch-lib_runtime__tools_c__src_Makefile.in,v 1.1 2015/02/19 11:56:18 jperkin Exp $ + +Avoid building empty DTrace probes, fixes D 1.11+. + +--- lib/runtime_tools/c_src/Makefile.in.orig 2013-09-16 18:12:18.000000000 +0000 ++++ lib/runtime_tools/c_src/Makefile.in +@@ -121,7 +121,7 @@ DTRACE_USER_HEADER= + endif + + DTRACE_OBJS = +-ifdef DTRACE_ENABLED_2STEP ++ifdef notDTRACE_ENABLED_2STEP + DTRACE_OBJS += $(OBJDIR)/dtrace_user.o + $(OBJDIR)/dtrace_user.o: $(before_DTrace_OBJS) $(OBJDIR)/dtrace_user.h + $(dtrace_verbose)dtrace -G -C \ |