1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "* configure.in (--enable-dtrace): change help message"

Browse Source 
This reverts commit 029b59ba53d0cc42630d623b52d94cae0df62734.
When $rb_cv_prog_dtrace_g is yes on FreeBSD even if /usr/bin/dtrace
exists, it means dtrace is disabled on the system.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37739 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2012-11-20 01:18:18 +00:00
parent f86396e40d
commit 49c0c51056
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,10 +1,3 @@
Mon Nov 19 22:55:48 2012 Naohisa Goto <ngotogenome@gmail.com>
* configure.in (--enable-dtrace): change help message
* configure.in (--enable-dtrace): remove ineffective "else AS_CASE ..."
because the variable $rb_cv_prog_dtrace_g is normally "yes" on
FreeBSD and the AS_CASE is not evaluated on FreeBSD.
Mon Nov 19 21:24:18 2012 Naohisa Goto <ngotogenome@gmail.com> Mon Nov 19 21:24:18 2012 Naohisa Goto <ngotogenome@gmail.com>
* vm_dump.c: not to include probes.h because the code does not depend * vm_dump.c: not to include probes.h because the code does not depend

6
configure.in
View File

@ -2731,7 +2731,7 @@ fi
AC_ARG_ENABLE(dtrace, AC_ARG_ENABLE(dtrace,
AS_HELP_STRING([--enable-dtrace], AS_HELP_STRING([--enable-dtrace],
[enable DTrace for tracing ruby's internal. enabled by default on systems having dtrace]), [enable DTrace for tracing ruby's internal.]),
[enable_dtrace=$enableval], [enable_dtrace=auto]) [enable_dtrace=$enableval], [enable_dtrace=auto])
if test "${enable_dtrace}" = "auto"; then if test "${enable_dtrace}" = "auto"; then
@ -2740,6 +2740,10 @@ if test "${enable_dtrace}" = "auto"; then
enable_dtrace=yes enable_dtrace=yes
if test "$rb_cv_prog_dtrace_g" = 'yes'; then if test "$rb_cv_prog_dtrace_g" = 'yes'; then
RUBY_DTRACE_BSD_BROKEN([enable_dtrace=no], [enable_dtrace=yes]) RUBY_DTRACE_BSD_BROKEN([enable_dtrace=no], [enable_dtrace=yes])
else
AS_CASE(["$target_os"],
[freebsd*], [enable_dtrace=no]
)
fi fi
else else
enable_dtrace=no enable_dtrace=no