diff options
| author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-11-19 01:04:53 +0000 |
|---|---|---|
| committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-11-19 01:04:53 +0000 |
| commit | f567a1a4d9b90ff2e20f4a1238d39dfbf5db6995 (patch) | |
| tree | 5b4d1848a5ff270df3cba1bda89098399710faa0 | |
| parent | e1ffb8766802e7d2887d90f124747f4a8991cc20 (diff) | |
* Makefile.in (.SUFFIX): bsdmake needs .SUFFIX is defined before use.
* common.mk: fix path of probes.dmyh.
* configure.in: FreeBSD's USDT requires libelf.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37713 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | Makefile.in | 2 | ||||
| -rw-r--r-- | common.mk | 8 | ||||
| -rw-r--r-- | configure.in | 4 |
4 files changed, 18 insertions, 4 deletions
@@ -1,3 +1,11 @@ +Mon Nov 19 10:00:10 2012 NARUSE, Yui <naruse@ruby-lang.org> + + * Makefile.in (.SUFFIX): bsdmake needs .SUFFIX is defined before use. + + * common.mk: fix path of probes.dmyh. + + * configure.in: FreeBSD's USDT requires libelf. + Mon Nov 19 01:11:59 2012 Naohisa Goto <ngotogenome@gmail.com> * vm_core.h, probes_helper.h (RUBY_DTRACE_FUNC_ENTRY_HOOK, diff --git a/Makefile.in b/Makefile.in index 46033d0c07..0306d99b4f 100644 --- a/Makefile.in +++ b/Makefile.in @@ -177,6 +177,8 @@ MESSAGE_END = ; do echo "$$line"; done configure_args = @configure_args@ #### End of variables +.SUFFIXES: .inc .h .c .y .i .$(DTRACE_EXT) + all: .DEFAULT: all @@ -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) 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) {$(VPATH)}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 probes.dmyh + $(Q)$(RM) parse.c parse.h lex.c newline.c revision.h {$(VPATH)}probes.dmyh realclean-ext:: realclean-golf: distclean-golf realclean-capi: PHONY @@ -901,10 +901,10 @@ golf_prelude.c: $(srcdir)/tool/compile_prelude.rb $(RBCONFIG) $(srcdir)/prelude. $(ECHO) generating $@ $(Q) $(COMPILE_PRELUDE) $(srcdir)/golf_prelude.rb $@ -$(srcdir)/probes.dmyh: {$(srcdir)}probes.d $(srcdir)/tool/gen_dummy_probes.rb +{$(VPATH)}probes.dmyh: {$(srcdir)}probes.d $(srcdir)/tool/gen_dummy_probes.rb $(BASERUBY) $(srcdir)/tool/gen_dummy_probes.rb $(srcdir)/probes.d > $@ -{$(srcdir)}.dmyh.h: +{$(VPATH)}.dmyh.h: @$(ECHO) copying dummy $(DEST_FILE) $(Q) $(CP) $(OS_SRC_FILE) $(OS_DEST_FILE) diff --git a/configure.in b/configure.in index 2afe75498f..7acb4e95ee 100644 --- a/configure.in +++ b/configure.in @@ -1286,6 +1286,10 @@ 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 |