View | Details | Raw Unified | Return to bug 257525 | Differences between
and this patch

Collapse All | Expand All

(-)lang/ruby26/Makefile (-1 / +1 lines)
Lines 32-38 CONFIGURE_ARGS= ${RUBY_CONFIGURE_ARGS} \ Link Here
32 
		--with-ruby-version=minor \
 32 
		--with-ruby-version=minor \
33 
		--with-sitedir="${PREFIX}/lib/ruby/site_ruby" \
 33 
		--with-sitedir="${PREFIX}/lib/ruby/site_ruby" \
34 
		--with-vendordir="${PREFIX}/lib/ruby/vendor_ruby"
 34 
		--with-vendordir="${PREFIX}/lib/ruby/vendor_ruby"
35 
CONFIGURE_ENV=	debugflags=
 35 
CONFIGURE_ENV=	debugflags= LD=${LD}
36 
CPPFLAGS+=	-I${LOCALBASE}/include
 36 
CPPFLAGS+=	-I${LOCALBASE}/include
37 
GNU_CONFIGURE=	yes
 37 
GNU_CONFIGURE=	yes
38 
# Keep this, else ruby will fail to load libraries dependent of libpthread.
 38 
# Keep this, else ruby will fail to load libraries dependent of libpthread.
(-)lang/ruby26/files/patch-tool_m4_ruby__dtrace__available.m4 (+11 lines)
Added Link Here
1 
--- tool/m4/ruby_dtrace_available.m4.orig	2021-07-07 10:38:58 UTC
2 
+++ tool/m4/ruby_dtrace_available.m4
3 
@@ -4,7 +4,7 @@ AC_DEFUN([RUBY_DTRACE_AVAILABLE],
4 
 [
5 
     echo "provider conftest{ probe fire(); };" > conftest_provider.d
6 
     rb_cv_dtrace_available=no
7 
-    AS_FOR(opt, rb_dtrace_opt, ["-xnolibs" ""], [dnl
8 
+    AS_FOR(opt, rb_dtrace_opt, ["-x cpppath=${CPP} -x ldpath=${LD} -xnolibs" "-xnolibs" ""], [dnl
9 
 	AS_IF([$DTRACE opt -h -o conftest_provider.h -s conftest_provider.d >/dev/null 2>/dev/null],
10 
 	    [], [continue])
11 
 	AC_TRY_COMPILE([@%:@include "conftest_provider.h"], [CONFTEST_FIRE();],

Return to bug 257525