Skip to content

M
MariaDB
Commit bccf56e5 authored by Mikael Ronstrom's avatar Mikael Ronstrom
Browse files
Options

Yet another attempt of getting DTrace builds done properly

parent 0751cc6c
Show whitespace changes
Inline Side-by-side
Showing with 31 additions and 30 deletions
mysys/Makefile.am
View file @ bccf56e5
...@@ -135,14 +135,14 @@ DTRACEPROVIDER = probes_mysql.d ...@@ -135,14 +135,14 @@ DTRACEPROVIDER = probes_mysql.d
dtrace_files: dtrace_files:
echo $(DTRACEFILES) > $@ echo $(DTRACEFILES) > $@
dtrace_providers: dtrace_sources dtrace_providers: probes_mysql.d
echo $(SQL_DTRACEPROVIDER) > $@ echo $(DTRACEPROVIDER) > $@
dtrace_sources: probes_mysql.d:
-$(RM) -f probes_mysql.d -$(RM) -f probes_mysql.d
$(CP) $(top_srcdir)/include/probes_mysql.d probes_mysql.d $(CP) $(top_srcdir)/include/probes_mysql.d probes_mysql.d
echo timestamp > dtrace_sources echo timestamp > dtrace_sources
probes_mysql.o: $(DTRACEPROVIDER) $(DTRACEFILES) dtrace_sources probes_mysql.o: $(DTRACEPROVIDER) $(DTRACEFILES)
$(DTRACE) $(DTRACEFLAGS) -G -s $(DTRACEPROVIDER) $(DTRACEFILES) -o $@ $(DTRACE) $(DTRACEFLAGS) -G -s $(DTRACEPROVIDER) $(DTRACEFILES) -o $@
endif endif
......
sql/Makefile.am
View file @ bccf56e5
...@@ -217,13 +217,13 @@ dtrace_files: ...@@ -217,13 +217,13 @@ dtrace_files:
echo $(DTRACEFILES) > $@ echo $(DTRACEFILES) > $@
dtrace_providers: dtrace_sources dtrace_providers: dtrace_sources
echo $(DTRACEPROVIDER) > $@ echo $(DTRACEPROVIDER) > $@
dtrace_sources: probes_mysql.d:
-$(RM) -f probes_mysql.d -$(RM) -f probes_mysql.d
$(CP) $(top_srcdir)/include/probes_mysql.d probes_mysql.d $(CP) $(top_srcdir)/include/probes_mysql.d probes_mysql.d
DTRACEDIRS = . ../mysys $(patsubst %,$(top_builddir)/storage/%,@mysql_se_dirs@) DTRACEDIRS = . ../mysys $(patsubst %,$(top_builddir)/storage/%,@mysql_se_dirs@)
probes_all.o: probes_mysql.d $(DTRACEFILES) dtrace_sources 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 "$$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 $@
......
storage/archive/Makefile.am
View file @ bccf56e5
...@@ -76,14 +76,14 @@ DTRACEPROVIDER = probes_mysql.d ...@@ -76,14 +76,14 @@ DTRACEPROVIDER = probes_mysql.d
dtrace_files: dtrace_files:
echo $(DTRACEFILES) > $@ echo $(DTRACEFILES) > $@
dtrace_providers: dtrace_sources dtrace_providers: probes_mysql.d
echo $(DTRACEPROVIDER) > $@ echo $(DTRACEPROVIDER) > $@
dtrace_sources: probes_mysql.d:
-$(RM) -f probes_mysql.d -$(RM) -f probes_mysql.d
$(CP) $(top_srcdir)/include/probes_mysql.d probes_mysql.d $(CP) $(top_srcdir)/include/probes_mysql.d probes_mysql.d
echo timestamp > dtrace_sources echo timestamp > dtrace_sources
probes_mysql.o: $(DTRACEPROVIDER) $(DTRACEFILES) dtrace_sources probes_mysql.o: $(DTRACEPROVIDER) $(DTRACEFILES)
$(DTRACE) $(DTRACEFLAGS) -G -s $(DTRACEPROVIDER) $(DTRACEFILES) -o $@ $(DTRACE) $(DTRACEFLAGS) -G -s $(DTRACEPROVIDER) $(DTRACEFILES) -o $@
endif endif
......
storage/blackhole/Makefile.am
View file @ bccf56e5
...@@ -58,14 +58,14 @@ DTRACEPROVIDER = probes_mysql.d ...@@ -58,14 +58,14 @@ DTRACEPROVIDER = probes_mysql.d
dtrace_files: dtrace_files:
echo $(DTRACEFILES) > $@ echo $(DTRACEFILES) > $@
dtrace_providers: dtrace_sources dtrace_providers: probes_mysql.d
echo $(DTRACEPROVIDER) > $@ echo $(DTRACEPROVIDER) > $@
dtrace_sources: probes_mysql.d:
-$(RM) -f probes_mysql.d -$(RM) -f probes_mysql.d
$(CP) $(top_srcdir)/include/probes_mysql.d probes_mysql.d $(CP) $(top_srcdir)/include/probes_mysql.d probes_mysql.d
echo timestamp > dtrace_sources echo timestamp > dtrace_sources
probes_mysql.o: $(DTRACEPROVIDER) $(DTRACEFILES) dtrace_sources probes_mysql.o: $(DTRACEPROVIDER) $(DTRACEFILES)
$(DTRACE) $(DTRACEFLAGS) -G -s $(DTRACEPROVIDER) $(DTRACEFILES) -o $@ $(DTRACE) $(DTRACEFLAGS) -G -s $(DTRACEPROVIDER) $(DTRACEFILES) -o $@
endif endif
......
storage/csv/Makefile.am
View file @ bccf56e5
...@@ -48,16 +48,17 @@ libcsv_a_DEPENDENCIES = probes_mysql.o dtrace_files dtrace_providers ...@@ -48,16 +48,17 @@ libcsv_a_DEPENDENCIES = probes_mysql.o dtrace_files dtrace_providers
CLEANFILES = probes_mysql.o dtrace_files dtrace_providers CLEANFILES = probes_mysql.o dtrace_files dtrace_providers
DTRACEFILES = libcsv_a-ha_tina.o DTRACEFILES = libcsv_a-ha_tina.o
DTRACEPROVIDER = probes_mysql.d DTRACEPROVIDER = probes_mysql.d
dtrace_sources:
-$(RM) -f probes_mysql.d
$(CP) $(top_srcdir)/include/probes_mysql.d probes_mysql.d
echo timestamp > dtrace_sources
dtrace_files: dtrace_files:
echo $(DTRACEFILES) > $@ echo $(DTRACEFILES) > $@
dtrace_providers: dtrace_sources dtrace_providers: probes_mysql.d
echo $(DTRACEPROVIDER) > $@ echo $(DTRACEPROVIDER) > $@
probes_mysql.o: $(DTRACEPROVIDER) $(DTRACEFILES) dtrace_sources probes_mysql.d:
-$(RM) -f probes_mysql.d
$(CP) $(top_srcdir)/include/probes_mysql.d probes_mysql.d
echo timestamp > dtrace_sources
probes_mysql.o: $(DTRACEPROVIDER) $(DTRACEFILES)
$(DTRACE) $(DTRACEFLAGS) -G -s $(DTRACEPROVIDER) $(DTRACEFILES) -o $@ $(DTRACE) $(DTRACEFLAGS) -G -s $(DTRACEPROVIDER) $(DTRACEFILES) -o $@
endif endif
......
storage/example/Makefile.am
View file @ bccf56e5
...@@ -59,14 +59,14 @@ DTRACEPROVIDER = probes_mysql.d ...@@ -59,14 +59,14 @@ DTRACEPROVIDER = probes_mysql.d
dtrace_files: dtrace_files:
echo $(DTRACEFILES) > $@ echo $(DTRACEFILES) > $@
dtrace_providers: dtrace_sources dtrace_providers: probes_mysql.d
echo $(DTRACEPROVIDER) > $@ echo $(DTRACEPROVIDER) > $@
dtrace_sources: probes_mysql.d:
-$(RM) -f probes_mysql.d -$(RM) -f probes_mysql.d
$(CP) $(top_srcdir)/include/probes_mysql.d probes_mysql.d $(CP) $(top_srcdir)/include/probes_mysql.d probes_mysql.d
echo timestamp > dtrace_sources echo timestamp > dtrace_sources
probes_mysql.o: $(DTRACEPROVIDER) $(DTRACEFILES) dtrace_sources probes_mysql.o: $(DTRACEPROVIDER) $(DTRACEFILES)
$(DTRACE) $(DTRACEFLAGS) -G -s $(DTRACEPROVIDER) $(DTRACEFILES) -o $@ $(DTRACE) $(DTRACEFLAGS) -G -s $(DTRACEPROVIDER) $(DTRACEFILES) -o $@
endif endif
......
storage/federated/Makefile.am
View file @ bccf56e5
...@@ -58,14 +58,14 @@ DTRACEPROVIDER = probes_mysql.d ...@@ -58,14 +58,14 @@ DTRACEPROVIDER = probes_mysql.d
dtrace_files: dtrace_files:
echo $(DTRACEFILES) > $@ echo $(DTRACEFILES) > $@
dtrace_providers: dtrace_sources dtrace_providers: probes_mysql.d
echo $(DTRACEPROVIDER) > $@ echo $(DTRACEPROVIDER) > $@
dtrace_sources: probes_mysql.d:
-$(RM) -f probes_mysql.d -$(RM) -f probes_mysql.d
$(CP) $(top_srcdir)/include/probes_mysql.d probes_mysql.d $(CP) $(top_srcdir)/include/probes_mysql.d probes_mysql.d
echo timestamp > dtrace_sources echo timestamp > dtrace_sources
probes_mysql.o: $(DTRACEPROVIDER) $(DTRACEFILES) dtrace_sources probes_mysql.o: $(DTRACEPROVIDER) $(DTRACEFILES)
$(DTRACE) $(DTRACEFLAGS) -G -s $(DTRACEPROVIDER) $(DTRACEFILES) -o $@ $(DTRACE) $(DTRACEFLAGS) -G -s $(DTRACEPROVIDER) $(DTRACEFILES) -o $@
endif endif
......
storage/myisam/Makefile.am
View file @ bccf56e5
...@@ -159,14 +159,14 @@ DTRACEPROVIDER = probes_mysql.d ...@@ -159,14 +159,14 @@ DTRACEPROVIDER = probes_mysql.d
dtrace_files: dtrace_files:
echo $(DTRACEFILES) > $@ echo $(DTRACEFILES) > $@
dtrace_providers: dtrace_sources dtrace_providers: probes_mysql.d
echo $(DTRACEPROVIDER) > $@ echo $(DTRACEPROVIDER) > $@
dtrace_sources: probes_mysql.d:
-$(RM) -f probes_mysql.d -$(RM) -f probes_mysql.d
$(CP) $(top_srcdir)/include/probes_mysql.d probes_mysql.d $(CP) $(top_srcdir)/include/probes_mysql.d probes_mysql.d
echo timestamp > dtrace_sources echo timestamp > dtrace_sources
probes_mysql.o: $(DTRACEPROVIDER) $(DTRACEFILES) dtrace_sources probes_mysql.o: $(DTRACEPROVIDER) $(DTRACEFILES)
$(DTRACE) $(DTRACEFLAGS) -G -s $(DTRACEPROVIDER) $(DTRACEFILES) -o $@ $(DTRACE) $(DTRACEFLAGS) -G -s $(DTRACEPROVIDER) $(DTRACEFILES) -o $@
endif endif
......
storage/myisammrg/Makefile.am
View file @ bccf56e5
...@@ -49,14 +49,14 @@ DTRACEPROVIDER = probes_mysql.d ...@@ -49,14 +49,14 @@ DTRACEPROVIDER = probes_mysql.d
dtrace_files: dtrace_files:
echo $(DTRACEFILES) > $@ echo $(DTRACEFILES) > $@
dtrace_providers: dtrace_sources dtrace_providers: probes_mysql.d
echo $(DTRACEPROVIDER) > $@ echo $(DTRACEPROVIDER) > $@
dtrace_sources: probes_mysql.d:
-$(RM) -f probes_mysql.d -$(RM) -f probes_mysql.d
$(CP) $(top_srcdir)/include/probes_mysql.d probes_mysql.d $(CP) $(top_srcdir)/include/probes_mysql.d probes_mysql.d
echo timestamp > dtrace_sources echo timestamp > dtrace_sources
probes_mysql.o: $(DTRACEPROVIDER) $(DTRACEFILES) dtrace_sources probes_mysql.o: $(DTRACEPROVIDER) $(DTRACEFILES)
$(DTRACE) $(DTRACEFLAGS) -G -s $(DTRACEPROVIDER) $(DTRACEFILES) -o $@ $(DTRACE) $(DTRACEFLAGS) -G -s $(DTRACEPROVIDER) $(DTRACEFILES) -o $@
endif 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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7