Commit 0a6d18f3 authored by Philip Stoev's avatar Philip Stoev

revert patch for bug #47146 because it breaks Solaris builds

parent 725f93fa
# Copyright (C) 2005-2006 MySQL AB, 2009 Sun Microsystems, Inc. # Copyright (C) 2005-2006 MySQL AB
# All rights reserved. #
# This program is free software; you can redistribute it and/or modify # This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by
# the Free Software Foundation; version 2 of the License. # the Free Software Foundation; version 2 of the License.
...@@ -50,18 +50,11 @@ libexample_a_SOURCES= ha_example.cc ...@@ -50,18 +50,11 @@ libexample_a_SOURCES= ha_example.cc
EXTRA_DIST = CMakeLists.txt plug.in EXTRA_DIST = CMakeLists.txt plug.in
if HAVE_DTRACE_DASH_G if HAVE_DTRACE_DASH_G
# The object for static and dynamic linking of example differ
# For static linkage of example to mysqld
# That's actually not needed as example is only dynamic loadable, but for completion
libexample_a_LIBADD = probes_mysql.o libexample_a_LIBADD = probes_mysql.o
libexample_a_DEPENDENCIES = probes_mysql.o dtrace_files dtrace_providers libexample_a_DEPENDENCIES = probes_mysql.o
# For example as shared library CLEANFILES =
ha_example_la_LIBADD = probes_sh_mysql.o BUILT_SOURCES =
ha_example_la_DEPENDENCIES = probes_sh_mysql.o $(DTRACESHAREDFILES) dtrace_providers
CLEANFILES = $(DTRACEPROVIDER) dtrace_files dtrace_providers $(DTRACESHAREDFILES)
DTRACEFILES = libexample_a-ha_example.o DTRACEFILES = libexample_a-ha_example.o
DTRACESHAREDFILES = .libs/ha_example_la-ha_example.o
DTRACEPROVIDER = probes_mysql.d DTRACEPROVIDER = probes_mysql.d
dtrace_files: dtrace_files:
...@@ -73,12 +66,8 @@ probes_mysql.d: ...@@ -73,12 +66,8 @@ probes_mysql.d:
$(CP) $(top_srcdir)/include/probes_mysql.d.base probes_mysql.d $(CP) $(top_srcdir)/include/probes_mysql.d.base probes_mysql.d
echo timestamp > dtrace_sources echo timestamp > dtrace_sources
probes_sh_mysql.o: $(DTRACEPROVIDER) $(DTRACESHAREDFILES)
$(DTRACE) $(DTRACEFLAGS) -G -s $(DTRACEPROVIDER) $(DTRACESHAREDFILES) -o $@
probes_mysql.o: $(DTRACEPROVIDER) $(DTRACEFILES) probes_mysql.o: $(DTRACEPROVIDER) $(DTRACEFILES)
$(DTRACE) $(DTRACEFLAGS) -G -s $(DTRACEPROVIDER) $(DTRACEFILES) -o $@ $(DTRACE) $(DTRACEFLAGS) -G -s $(DTRACEPROVIDER) $(DTRACEFILES) -o $@
endif endif
# Don't update the files from bitkeeper # Don't update the files from bitkeeper
......
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