Attachment 227720 Details for Bug 257525 – dtrace patch

[patch] dtrace patch

dtrace-ports-llvm.patch (text/plain), 1.39 KB, created by Ghost on 2021-09-06 21:09:37 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ghost

Created: 2021-09-06 21:09:37 UTC

Size: 1.39 KB

patch

obsolete

>diff --git lang/ruby26/Makefile lang/ruby26/Makefile
>index c14c50d81c61..30675aedd811 100644
>--- lang/ruby26/Makefile
>+++ lang/ruby26/Makefile
>@@ -32,7 +32,7 @@ CONFIGURE_ARGS=	${RUBY_CONFIGURE_ARGS} \
> 		--with-ruby-version=minor \
> 		--with-sitedir="${PREFIX}/lib/ruby/site_ruby" \
> 		--with-vendordir="${PREFIX}/lib/ruby/vendor_ruby"
>-CONFIGURE_ENV=	debugflags=
>+CONFIGURE_ENV=	debugflags= LD=${LD}
> CPPFLAGS+=	-I${LOCALBASE}/include
> GNU_CONFIGURE=	yes
> # Keep this, else ruby will fail to load libraries dependent of libpthread.
>diff --git lang/ruby26/files/patch-tool_m4_ruby__dtrace__available.m4 lang/ruby26/files/patch-tool_m4_ruby__dtrace__available.m4
>new file mode 100644
>index 000000000000..8f250f8a5926
>--- /dev/null
>+++ lang/ruby26/files/patch-tool_m4_ruby__dtrace__available.m4
>@@ -0,0 +1,11 @@
>+--- tool/m4/ruby_dtrace_available.m4.orig	2021-07-07 10:38:58 UTC
>++++ tool/m4/ruby_dtrace_available.m4
>+@@ -4,7 +4,7 @@ AC_DEFUN([RUBY_DTRACE_AVAILABLE],
>+ [
>+     echo "provider conftest{ probe fire(); };" > conftest_provider.d
>+     rb_cv_dtrace_available=no
>+-    AS_FOR(opt, rb_dtrace_opt, ["-xnolibs" ""], [dnl
>++    AS_FOR(opt, rb_dtrace_opt, ["-x cpppath=${CPP} -x ldpath=${LD} -xnolibs" "-xnolibs" ""], [dnl
>+ 	AS_IF([$DTRACE opt -h -o conftest_provider.h -s conftest_provider.d >/dev/null 2>/dev/null],
>+ 	    [], [continue])
>+ 	AC_TRY_COMPILE([@%:@include "conftest_provider.h"], [CONFTEST_FIRE();],

Actions: View | Diff

Attachments on bug 257525: 226826 | 227715 | 227718 | 227720