database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-05 13:16:09 +03:00
Code Activity

Fixed DTrace-related build failures.

Browse Source 
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
This commit is contained in:
Alexey Kopytov
2008-12-23 12:05:30 +03:00
parent d08a300b11
commit 459af24ed2
3 changed files with 119 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
scripts/dheadgen.pl Normal file → Executable file
View File

8
sql/Makefile.am
View File

@@ -29,7 +29,7 @@ libexec_PROGRAMS = mysqld
EXTRA_PROGRAMS = gen_lex_hash EXTRA_PROGRAMS = gen_lex_hash
bin_PROGRAMS = mysql_tzinfo_to_sql bin_PROGRAMS = mysql_tzinfo_to_sql
DTRACEFILES = filesort.o \ DTRACEFILES = filesort.o \
libndb_la-ha_ndbcluster.o \ .libs/libndb_la-ha_ndbcluster.o \
handler.o \ handler.o \
mysqld.o \ mysqld.o \
net_serv.o \ net_serv.o \
@@ -208,9 +208,9 @@ install-exec-hook:
if HAVE_DTRACE_DASH_G if HAVE_DTRACE_DASH_G
libndb_la_LIBADD = probes_all.o 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_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 CLEANFILES += dtrace_files dtrace_providers probes_all.o
DTRACEPROVIDER = $(abs_top_srcdir)/sql/probes_mysql.d 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) 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 /'`; \ 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 $@ $(DTRACE) $(DTRACEFLAGS) -G $$providers $$objects -o $@
endif endif