[Commits] Rev 2934: MWL#74: second attempt at fixing Mac OS X build failure. in http://bazaar.launchpad.net/~maria-captains/maria/5.1

knielsen at knielsen-hq.org knielsen at knielsen-hq.org
Mon Nov 15 15:42:03 EET 2010


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

------------------------------------------------------------
revno: 2934
revision-id: knielsen at knielsen-hq.org-20101115134202-qm4253l5s2tm596z
parent: knielsen at knielsen-hq.org-20101113091540-hnkjc85byrkzo61r
committer: knielsen at knielsen-hq.org
branch nick: work-5.1-mwl74
timestamp: Mon 2010-11-15 14:42:02 +0100
message:
  MWL#74: second attempt at fixing Mac OS X build failure.
=== modified file 'storage/maria/Makefile.am'
--- a/storage/maria/Makefile.am	2010-11-13 09:15:40 +0000
+++ b/storage/maria/Makefile.am	2010-11-15 13:42:02 +0000
@@ -61,7 +61,10 @@ 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.la \
+# We use "-lmaria" rather than "libmaria.a" here; the reason is that
+# libmaria.a includes ma_loghandler.c already, and using the latter we
+# get duplicate symbol linker errors on Mac OS X.
+maria_dump_log_LDADD=           @CLIENT_EXTRA_LDFLAGS@ -lmaria \
                         $(top_builddir)/storage/myisam/libmyisam.a \
                         $(top_builddir)/mysys/libmysys.a \
                         $(top_builddir)/dbug/libdbug.a \



More information about the commits mailing list