[Commits] Rev 2933: MWL#74: Attempt to fix build failure on mac. in http://bazaar.launchpad.net/~maria-captains/maria/5.1

knielsen at knielsen-hq.org knielsen at knielsen-hq.org
Sat Nov 13 11:05:41 EET 2010


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

------------------------------------------------------------
revno: 2933
revision-id: knielsen at knielsen-hq.org-20101113090540-raee38d1ut2ond0a
parent: knielsen at knielsen-hq.org-20101112205941-u3rh9dq6719wlg8y
committer: knielsen at knielsen-hq.org
branch nick: work-5.1-mwl74
timestamp: Sat 2010-11-13 10:05:40 +0100
message:
  MWL#74: Attempt to fix build failure on mac.
  
  Aria builds maria_dump_log by re-compiling ma_loghandler.c (which is also
  in libmaria.a) with different CFLAGS. This causes duplicate symbols, which
  caused link failures on mac.
  
  Attempt to fix by instead linking the libtool convenience library for
  libmaria, and putting it last (idea is that this should work like normal
  library linking, where only needed symbols not already defined are pulled
  in).
=== modified file 'storage/maria/Makefile.am'
--- a/storage/maria/Makefile.am	2010-11-12 20:59:41 +0000
+++ b/storage/maria/Makefile.am	2010-11-13 09:05:40 +0000
@@ -61,11 +61,12 @@ maria_read_log_LDADD=		@CLIENT_EXTRA_LDF
                         $(top_builddir)/dbug/libdbug.a \
                         $(top_builddir)/strings/libmystrings.a @ZLIB_LIBS@
 maria_dump_log_DEPENDENCIES=$(LIBRARIES) ma_loghandler.c
-maria_dump_log_LDADD=           @CLIENT_EXTRA_LDFLAGS@ libmaria.a \
+maria_dump_log_LDADD=           @CLIENT_EXTRA_LDFLAGS@ \
                         $(top_builddir)/storage/myisam/libmyisam.a \
                         $(top_builddir)/mysys/libmysys.a \
                         $(top_builddir)/dbug/libdbug.a \
-                        $(top_builddir)/strings/libmystrings.a @ZLIB_LIBS@
+                        $(top_builddir)/strings/libmystrings.a \
+                        libmaria.la @ZLIB_LIBS@
 maria_dump_log_SOURCES= ma_loghandler.c unittest/ma_loghandler_examples.c
 maria_dump_log_CPPFLAGS= -DMARIA_DUMP_LOG
 noinst_PROGRAMS =       ma_test1 ma_test2 ma_test3 ma_rt_test ma_sp_test



More information about the commits mailing list