Skip to content

M
mariadb
Commit 3af63f45 authored by Mikael Ronstrom's avatar Mikael Ronstrom
Browse files
Options

Merge some more DTrace build fixes by MC Brown

parents f3ea2bbd 54850da8
Show whitespace changes
Inline Side-by-side
Showing with 12 additions and 12 deletions
include/Makefile.am
View file @ 3af63f45
...@@ -44,7 +44,7 @@ noinst_HEADERS = config-win.h config-netware.h my_bit.h \ ...@@ -44,7 +44,7 @@ noinst_HEADERS = config-win.h config-netware.h my_bit.h \
atomic/gcc_builtins.h my_libwrap.h my_stacktrace.h \ atomic/gcc_builtins.h my_libwrap.h my_stacktrace.h \
probes_mysql.h probes_mysql_nodtrace.h probes_mysql.h probes_mysql_nodtrace.h
EXTRA_DIST = mysql.h.pp mysql/plugin.h.pp probes_mysql.d EXTRA_DIST = mysql.h.pp mysql/plugin.h.pp probes_mysql.d.base
# Remove built files and the symlinked directories # Remove built files and the symlinked directories
CLEANFILES = $(BUILT_SOURCES) readline openssl CLEANFILES = $(BUILT_SOURCES) readline openssl
...@@ -72,7 +72,7 @@ dist-hook: ...@@ -72,7 +72,7 @@ dist-hook:
probes_mysql.d: probes_mysql.d:
if ! test -f probes_mysql.d ; then \ if ! test -f probes_mysql.d ; then \
$(CP) -f $(top_srcdir)/include/probes_mysql.d probes_mysql.d; \ $(CP) -f $(top_srcdir)/include/probes_mysql.d.base probes_mysql.d; \
fi fi
DTRACEPROVIDER = probes_mysql.d DTRACEPROVIDER = probes_mysql.d
......
mysys/Makefile.am
View file @ 3af63f45
...@@ -139,7 +139,7 @@ dtrace_providers: probes_mysql.d ...@@ -139,7 +139,7 @@ dtrace_providers: probes_mysql.d
echo $(DTRACEPROVIDER) > $@ echo $(DTRACEPROVIDER) > $@
probes_mysql.d: 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.base probes_mysql.d
echo timestamp > dtrace_sources echo timestamp > dtrace_sources
probes_mysql.o: $(DTRACEPROVIDER) $(DTRACEFILES) probes_mysql.o: $(DTRACEPROVIDER) $(DTRACEFILES)
......
sql/Makefile.am
View file @ 3af63f45
...@@ -236,7 +236,7 @@ dtrace_providers: probes_mysql.d ...@@ -236,7 +236,7 @@ dtrace_providers: probes_mysql.d
echo $(DTRACEPROVIDER) > $@ echo $(DTRACEPROVIDER) > $@
probes_mysql.d: 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.base probes_mysql.d
DTRACEDIRS = . ../mysys $(patsubst %,$(top_builddir)/storage/%,@mysql_se_dirs@) DTRACEDIRS = . ../mysys $(patsubst %,$(top_builddir)/storage/%,@mysql_se_dirs@)
......
storage/archive/Makefile.am
View file @ 3af63f45
...@@ -80,7 +80,7 @@ dtrace_providers: probes_mysql.d ...@@ -80,7 +80,7 @@ dtrace_providers: probes_mysql.d
echo $(DTRACEPROVIDER) > $@ echo $(DTRACEPROVIDER) > $@
probes_mysql.d: 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.base probes_mysql.d
echo timestamp > dtrace_sources echo timestamp > dtrace_sources
probes_mysql.o: $(DTRACEPROVIDER) $(DTRACEFILES) probes_mysql.o: $(DTRACEPROVIDER) $(DTRACEFILES)
......
storage/blackhole/Makefile.am
View file @ 3af63f45
...@@ -62,7 +62,7 @@ dtrace_providers: probes_mysql.d ...@@ -62,7 +62,7 @@ dtrace_providers: probes_mysql.d
echo $(DTRACEPROVIDER) > $@ echo $(DTRACEPROVIDER) > $@
probes_mysql.d: 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.base probes_mysql.d
echo timestamp > dtrace_sources echo timestamp > dtrace_sources
probes_mysql.o: $(DTRACEPROVIDER) $(DTRACEFILES) probes_mysql.o: $(DTRACEPROVIDER) $(DTRACEFILES)
......
storage/csv/Makefile.am
View file @ 3af63f45
...@@ -55,7 +55,7 @@ dtrace_providers: probes_mysql.d ...@@ -55,7 +55,7 @@ dtrace_providers: probes_mysql.d
echo $(DTRACEPROVIDER) > $@ echo $(DTRACEPROVIDER) > $@
probes_mysql.d: 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.base probes_mysql.d
echo timestamp > dtrace_sources echo timestamp > dtrace_sources
probes_mysql.o: $(DTRACEPROVIDER) $(DTRACEFILES) probes_mysql.o: $(DTRACEPROVIDER) $(DTRACEFILES)
......
storage/example/Makefile.am
View file @ 3af63f45
...@@ -63,7 +63,7 @@ dtrace_providers: probes_mysql.d ...@@ -63,7 +63,7 @@ dtrace_providers: probes_mysql.d
echo $(DTRACEPROVIDER) > $@ echo $(DTRACEPROVIDER) > $@
probes_mysql.d: 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.base probes_mysql.d
echo timestamp > dtrace_sources echo timestamp > dtrace_sources
probes_mysql.o: $(DTRACEPROVIDER) $(DTRACEFILES) probes_mysql.o: $(DTRACEPROVIDER) $(DTRACEFILES)
......
storage/federated/Makefile.am
View file @ 3af63f45
...@@ -62,7 +62,7 @@ dtrace_providers: probes_mysql.d ...@@ -62,7 +62,7 @@ dtrace_providers: probes_mysql.d
echo $(DTRACEPROVIDER) > $@ echo $(DTRACEPROVIDER) > $@
probes_mysql.d: 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.base probes_mysql.d
echo timestamp > dtrace_sources echo timestamp > dtrace_sources
probes_mysql.o: $(DTRACEPROVIDER) $(DTRACEFILES) probes_mysql.o: $(DTRACEPROVIDER) $(DTRACEFILES)
......
storage/heap/Makefile.am
View file @ 3af63f45
...@@ -64,7 +64,7 @@ dtrace_providers: probes_mysql.d ...@@ -64,7 +64,7 @@ dtrace_providers: probes_mysql.d
echo $(DTRACEPROVIDER) > $@ echo $(DTRACEPROVIDER) > $@
probes_mysql.d: 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.base probes_mysql.d
echo timestamp > dtrace_sources echo timestamp > dtrace_sources
probes_mysql.o: $(DTRACEPROVIDER) $(DTRACEFILES) probes_mysql.o: $(DTRACEPROVIDER) $(DTRACEFILES)
......
storage/myisam/Makefile.am
View file @ 3af63f45
...@@ -163,7 +163,7 @@ dtrace_providers: probes_mysql.d ...@@ -163,7 +163,7 @@ dtrace_providers: probes_mysql.d
echo $(DTRACEPROVIDER) > $@ echo $(DTRACEPROVIDER) > $@
probes_mysql.d: 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.base probes_mysql.d
echo timestamp > dtrace_sources echo timestamp > dtrace_sources
probes_mysql.o: $(DTRACEPROVIDER) $(DTRACEFILES) probes_mysql.o: $(DTRACEPROVIDER) $(DTRACEFILES)
......
storage/myisammrg/Makefile.am
View file @ 3af63f45
...@@ -53,7 +53,7 @@ dtrace_providers: probes_mysql.d ...@@ -53,7 +53,7 @@ dtrace_providers: probes_mysql.d
echo $(DTRACEPROVIDER) > $@ echo $(DTRACEPROVIDER) > $@
probes_mysql.d: 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.base probes_mysql.d
echo timestamp > dtrace_sources echo timestamp > dtrace_sources
probes_mysql.o: $(DTRACEPROVIDER) $(DTRACEFILES) probes_mysql.o: $(DTRACEPROVIDER) $(DTRACEFILES)
......
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