Commit 01c6a194 authored by Alexey Kopytov's avatar Alexey Kopytov

Fixed DTrace-related build failures.


include/probes_mysql_nodtrace.h:
  Regenerated with dheadgen.pl
scripts/dheadgen.pl:
  Set the executable bit.
sql/Makefile.am:
  Since libndb.la is a libtool library, we should process objects in .libs/.
  Removed '-n' from the echo command since the Solaris version does not understand it.
  Changed the order of dependencies so that dtrace_files and dtrace_providers are
  created before probes_all.o
parent f9b5640c
This diff is collapsed.
File mode changed from 100644 to 100755
......@@ -29,7 +29,7 @@ libexec_PROGRAMS = mysqld
EXTRA_PROGRAMS = gen_lex_hash
bin_PROGRAMS = mysql_tzinfo_to_sql
DTRACEFILES = filesort.o \
libndb_la-ha_ndbcluster.o \
.libs/libndb_la-ha_ndbcluster.o \
handler.o \
mysqld.o \
net_serv.o \
......@@ -208,9 +208,9 @@ install-exec-hook:
if HAVE_DTRACE_DASH_G
libndb_la_LIBADD = probes_all.o
libndb_la_DEPENDENCIES = probes_all.o dtrace_files dtrace_providers
libndb_la_DEPENDENCIES = dtrace_files dtrace_providers probes_all.o
mysqld_LDADD += probes_all.o
mysqld_DEPENDENCIES += probes_all.o dtrace_files dtrace_providers
mysqld_DEPENDENCIES += dtrace_files dtrace_providers probes_all.o
CLEANFILES += dtrace_files dtrace_providers probes_all.o
DTRACEPROVIDER = $(abs_top_srcdir)/sql/probes_mysql.d
......@@ -223,7 +223,7 @@ DTRACEDIRS = . ../mysys $(patsubst %,$(top_builddir)/storage/%,@mysql_se_dirs@)
probes_all.o: probes_mysql.d $(DTRACEFILES)
providers=`(for i in $(DTRACEDIRS); do cat $$i/dtrace_providers 2>/dev/null; done) | tr " " "\n" | sort | uniq | sed -e '/^$$/d' -e 's/^/-s /'`; \
objects=`for i in $(DTRACEDIRS); do f=\`cat $$i/dtrace_files 2>/dev/null\`; for j in $$f; do test -f $$i/$$j && echo -n "$$i/$$j "; done; done`; \
objects=`for i in $(DTRACEDIRS); do f=\`cat $$i/dtrace_files 2>/dev/null\`; for j in $$f; do test -f $$i/$$j && echo "$$i/$$j "; done; done`; \
$(DTRACE) $(DTRACEFLAGS) -G $$providers $$objects -o $@
endif
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment