diff options
| author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-11-19 06:11:36 +0000 |
|---|---|---|
| committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-11-19 06:11:36 +0000 |
| commit | 24512ba1b4be9698f127795d8e9ccfe96640983c (patch) | |
| tree | 2543ae9d55e5561e166d4bb0938a21a612323bc3 | |
| parent | 15d940b8b0361925e15f412913f346fca4bf3400 (diff) | |
| download | ruby-24512ba1b4be9698f127795d8e9ccfe96640983c.tar.gz | |
* configure.in: fix didn't enable_dtrace=yes on auto.
* configure.in: see enable_dtrace for adding libelf on FreeBSD.
* common.mk: VPATH is not needed.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37717 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | common.mk | 4 | ||||
| -rw-r--r-- | configure.in | 11 |
3 files changed, 16 insertions, 7 deletions
@@ -1,3 +1,11 @@ +Mon Nov 19 15:09:07 2012 NARUSE, Yui <naruse@ruby-lang.org> + + * configure.in: fix didn't enable_dtrace=yes on auto. + + * configure.in: see enable_dtrace for adding libelf on FreeBSD. + + * common.mk: VPATH is not needed. + Mon Nov 19 14:55:51 2012 Koichi Sasada <ko1@atdot.net> * thread.c: add `Thread#backtrace_locations' method. @@ -435,7 +435,7 @@ clean: clean-ext clean-local clean-enc clean-golf clean-rdoc clean-capi clean-ex clean-local:: PHONY $(Q)$(RM) $(OBJS) $(MINIOBJS) $(MAINOBJ) $(LIBRUBY_A) $(LIBRUBY_SO) $(LIBRUBY) $(LIBRUBY_ALIASES) $(Q)$(RM) $(PROGRAM) $(WPROGRAM) miniruby$(EXEEXT) dmyext.$(OBJEXT) $(ARCHFILE) .*.time - $(Q)$(RM) y.tab.c y.output encdb.h transdb.h prelude.c config.log rbconfig.rb $(ruby_pc) {$(VPATH)}probes.h probes.$(OBJEXT) probes.stamp ruby-glommed.$(OBJEXT) + $(Q)$(RM) y.tab.c y.output encdb.h transdb.h prelude.c config.log rbconfig.rb $(ruby_pc) probes.h probes.$(OBJEXT) probes.stamp ruby-glommed.$(OBJEXT) clean-ext:: PHONY clean-golf: PHONY $(Q)$(RM) $(GORUBY)$(EXEEXT) $(GOLFOBJS) @@ -460,7 +460,7 @@ distclean-platform: clean-platform realclean:: realclean-ext realclean-local realclean-enc realclean-golf realclean-extout realclean-local:: distclean-local - $(Q)$(RM) parse.c parse.h lex.c newline.c revision.h {$(VPATH)}probes.dmyh + $(Q)$(RM) parse.c parse.h lex.c newline.c revision.h realclean-ext:: realclean-golf: distclean-golf realclean-capi: PHONY diff --git a/configure.in b/configure.in index 7acb4e95ee..183d3ba954 100644 --- a/configure.in +++ b/configure.in @@ -1286,10 +1286,6 @@ main() AC_DEFINE(BROKEN_SETREGID, 1) ac_cv_sizeof_rlim_t=8], [freebsd*], [ LIBS="-lm $LIBS" - if test "${rb_cv_prog_dtrace_g}" = "yes"; then - # FreeBSD's dtrace requires libelf - LIBS="-lelf $LIBS" - fi ac_cv_func_getpeername=no ac_cv_func_getsockname=no ac_cv_func_shutdown=no @@ -2741,10 +2737,10 @@ AC_ARG_ENABLE(dtrace, if test "${enable_dtrace}" = "auto"; then if test x"$DTRACE" != x -a x"$cross_compiling" != xyes; then RUBY_DTRACE_POSTPROCESS() + enable_dtrace=yes if test "$rb_cv_prog_dtrace_g" = 'yes'; then RUBY_DTRACE_BSD_BROKEN([enable_dtrace=no], [enable_dtrace=yes]) else - enable_dtrace=yes AS_CASE(["$target_os"], [freebsd*], [enable_dtrace=no] ) @@ -2778,6 +2774,11 @@ AC_SUBST(DTRACE_OBJ) AC_SUBST(DTRACE_GLOMMED_OBJ) AC_SUBST(LIBRUBY_A_OBJS) +if test "${enable_dtrace}" = "yes"; then + # FreeBSD's dtrace requires libelf + LIBS="-lelf $LIBS" +fi + } { # build section |