[Commits] Rev 2932: MWL#74: Fixes for libmysqld.so problems in Buildbot. in http://bazaar.launchpad.net/~maria-captains/maria/5.1

knielsen at knielsen-hq.org knielsen at knielsen-hq.org
Fri Nov 12 22:59:42 EET 2010


At http://bazaar.launchpad.net/~maria-captains/maria/5.1

------------------------------------------------------------
revno: 2932
revision-id: knielsen at knielsen-hq.org-20101112205941-u3rh9dq6719wlg8y
parent: knielsen at knielsen-hq.org-20101112181454-u4yy5aiysnvdc6sw
committer: knielsen at knielsen-hq.org
branch nick: work-5.1-mwl74
timestamp: Fri 2010-11-12 21:59:41 +0100
message:
  MWL#74: Fixes for libmysqld.so problems in Buildbot.
  Avoid `make dist` thinking it needs libmystrings.c etc.
  Try to fix a wierd link error on mac.
=== modified file 'client/Makefile.am'
--- a/client/Makefile.am	2010-11-12 18:14:54 +0000
+++ b/client/Makefile.am	2010-11-12 20:59:41 +0000
@@ -74,8 +74,7 @@ mysqlimport_SOURCES=		mysqlimport.c
 mysqlimport_CFLAGS=             -DTHREAD -UUNDEF_THREADS_HACK
 mysqlimport_LDADD =             $(CXXLDFLAGS) $(CLIENT_THREAD_LIBS) \
                                 @CLIENT_EXTRA_LDFLAGS@ \
-                                $(LIBMYSQLCLIENT_LA) \
-                                $(top_builddir)/mysys/libmysys.a
+                                $(LIBMYSQLCLIENT_LA)
 
 mysqlshow_SOURCES=              mysqlshow.c
 
@@ -83,15 +82,14 @@ mysqlslap_SOURCES=		mysqlslap.c
 mysqlslap_CFLAGS=               -DTHREAD -UMYSQL_CLIENT_NO_THREADS
 mysqlslap_LDADD =               $(CXXLDFLAGS) $(CLIENT_THREAD_LIBS) \
                                 @CLIENT_EXTRA_LDFLAGS@ \
-                                $(LIBMYSQLCLIENT_LA) \
-                                $(top_builddir)/mysys/libmysys.a
+                                $(LIBMYSQLCLIENT_LA)
 
 mysqltest_SOURCES=              mysqltest.cc
 mysqltest_CXXFLAGS=             -DTHREAD -UMYSQL_CLIENT_NO_THREADS
 mysqltest_LDADD =               $(CXXLDFLAGS) $(CLIENT_THREAD_LIBS) \
                                 @CLIENT_EXTRA_LDFLAGS@ \
-                                $(LIBMYSQLCLIENT_LA) \
                                 $(top_builddir)/mysys/libmysys.a \
+                                $(LIBMYSQLCLIENT_LA) \
                                 $(top_builddir)/regex/libregex.la
                                 $(CLIENT_THREAD_LIBS)
 

=== modified file 'dbug/Makefile.am'
--- a/dbug/Makefile.am	2010-11-12 18:14:54 +0000
+++ b/dbug/Makefile.am	2010-11-12 20:59:41 +0000
@@ -67,5 +67,6 @@ output5.r:      factorial
 tests-t:        tests-t.pl
                 cp -f $(srcdir)/tests-t.pl ./tests-t
 
+libdbug_a_SOURCES=
 libdbug.a: libdbug.la
         $(CP) .libs/libdbug.a $@

=== modified file 'mysys/Makefile.am'
--- a/mysys/Makefile.am	2010-11-12 18:14:54 +0000
+++ b/mysys/Makefile.am	2010-11-12 20:59:41 +0000
@@ -97,6 +97,7 @@ CLEANFILES =		test_bitmap$(EXEEXT) test_
                         testhash$(EXEEXT) test_gethwaddr$(EXEEXT) \
                         test_base64$(EXEEXT) test_thr_mutex$(EXEEXT)
 
+libmysys_a_SOURCES=
 libmysys.a: libmysys.la
         $(CP) .libs/libmysys.a $@
 

=== modified file 'storage/heap/Makefile.am'
--- a/storage/heap/Makefile.am	2010-11-12 18:14:54 +0000
+++ b/storage/heap/Makefile.am	2010-11-12 20:59:41 +0000
@@ -58,6 +58,7 @@ libheap_embedded_la_SOURCES =	ha_heap.cc
 libheap_embedded_la_LIBADD =    libheap.la
 libheap_embedded_la_CXXFLAGS =  @plugin_embedded_defs@
 
+libheap_a_SOURCES=
 libheap.a: libheap.la
         $(CP) .libs/libheap.a $@
 

=== modified file 'storage/maria/Makefile.am'
--- a/storage/maria/Makefile.am	2010-11-12 18:14:54 +0000
+++ b/storage/maria/Makefile.am	2010-11-12 20:59:41 +0000
@@ -146,6 +146,7 @@ libmaria_embedded_la_SOURCES =	ha_maria.
 libmaria_embedded_la_LIBADD =   libmaria.la
 libmaria_embedded_la_CXXFLAGS = $(AM_CXXFLAGS) @plugin_embedded_defs@
 
+libmaria_a_SOURCES=
 libmaria.a: libmaria.la
         $(CP) .libs/libmaria.a $@
 

=== modified file 'storage/myisam/Makefile.am'
--- a/storage/myisam/Makefile.am	2010-11-12 18:14:54 +0000
+++ b/storage/myisam/Makefile.am	2010-11-12 20:59:41 +0000
@@ -112,6 +112,7 @@ libmyisam_embedded_la_SOURCES =	ha_myisa
 libmyisam_embedded_la_CXXFLAGS =        $(AM_CXXFLAGS) @plugin_embedded_defs@
 libmyisam_embedded_la_LIBADD =  libmyisam.la
 
+libmyisam_a_SOURCES=
 libmyisam.a: libmyisam.la
         $(CP) .libs/libmyisam.a $@
 

=== modified file 'storage/myisammrg/Makefile.am'
--- a/storage/myisammrg/Makefile.am	2010-11-12 18:14:54 +0000
+++ b/storage/myisammrg/Makefile.am	2010-11-12 20:59:41 +0000
@@ -44,6 +44,7 @@ libmyisammrg_embedded_la_SOURCES = ha_my
 libmyisammrg_embedded_la_CXXFLAGS =     $(AM_CXXFLAGS) @plugin_embedded_defs@
 libmyisammrg_embedded_la_LIBADD = libmyisammrg.la
 
+libmyisammrg_a_SOURCES=
 libmyisammrg.a: libmyisammrg.la
         $(CP) .libs/libmyisammrg.a $@
 

=== modified file 'strings/Makefile.am'
--- a/strings/Makefile.am	2010-11-12 18:14:54 +0000
+++ b/strings/Makefile.am	2010-11-12 20:59:41 +0000
@@ -67,6 +67,7 @@ conf_to_src_LDFLAGS= @NOINST_LDFLAGS@
 # This is because the dependency tracking misses @FOO@ vars in sources.
 #strtoull.o:            @CHARSET_OBJS@
 
+libmystrings_a_SOURCES=
 libmystrings.a: libmystrings.la
         $(CP) .libs/libmystrings.a $@
 

=== modified file 'vio/Makefile.am'
--- a/vio/Makefile.am	2010-11-12 18:14:54 +0000
+++ b/vio/Makefile.am	2010-11-12 20:59:41 +0000
@@ -25,6 +25,7 @@ libvio_la_SOURCES =	vio.c viosocket.c vi
 
 EXTRA_DIST=             CMakeLists.txt
 
+libvio_a_SOURCES=
 libvio.a: libvio.la
         $(CP) .libs/libvio.a $@
 



More information about the commits mailing list