MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:Georgi Kodinov Date:February 12 2010 2:37pm
Subject:bzr commit into mysql-pe branch (joro:3902) Bug#47416
View as plain text  
#At file:///Users/kgeorge/mysql/work/B47416-pe/ based on revid:sergey.glukhov@stripped

 3902 Georgi Kodinov	2010-02-12
      Bug #47416: Build failure on OS X 10.6: duplicate symbol _timed_mutexes
      
      my_static.o is included in both ndbclient lib and the mysys lib. As a
      result it gets added twice into libmysqld.a.
      As a result all the global symbols defined in it are defined twice.
      This is not a problem for the most of the linkers, but gcc on MacOSX 10.6
      has been changed to consider this a problem (radar 6320843).
      Fixed by adding an option to ranlib to generate a library that doesn't have
      the symbols from my_static (and others) defined twice.
     @ configure.in
        Add a branch for Snow Leopard and define the ranlib compatibility flag
     @ libmysqld/Makefile.am
        use the ranlib compatibility flag

    modified:
      configure.in
      libmysqld/Makefile.am
=== modified file 'configure.in'
--- a/configure.in	2010-02-05 07:16:19 +0000
+++ b/configure.in	2010-02-12 14:37:16 +0000
@@ -1238,6 +1238,17 @@ case $SYSTEM_TYPE in
       MAX_C_OPTIMIZE="-O"
     fi
     ;;
+  *darwin10*)
+    if test "$GCC" = "yes"
+    then
+      FLAGS="-D_P1003_1B_VISIBLE -DSIGNAL_WITH_VIO_CLOSE -DSIGNALS_DONT_BREAK_READ -DIGNORE_SIGHUP_SIGQUIT  -DDONT_DECLARE_CXA_PURE_VIRTUAL"
+      CFLAGS="$CFLAGS $FLAGS"
+      CXXFLAGS="$CXXFLAGS $FLAGS"
+      MAX_C_OPTIMIZE="-O"
+      extra_ranlibflags_for_target=" -c"
+      AC_SUBST(extra_ranlibflags_for_target)
+    fi
+    ;;
   *darwin*)
     if test "$GCC" = "yes"
     then

=== modified file 'libmysqld/Makefile.am'
--- a/libmysqld/Makefile.am	2010-01-25 15:56:14 +0000
+++ b/libmysqld/Makefile.am	2010-02-12 14:37:16 +0000
@@ -182,7 +182,7 @@ else
 		      continue 2; fi; done; \
 		  done; echo $(libmysqld_a_DEPENDENCIES) ) | sort -u | xargs $(AR) cq libmysqld.a ; \
 		  $(AR) r libmysqld.a $(storageobjects); \
-		  $(RANLIB) libmysqld.a	; \
+		  $(RANLIB) $(extra_ranlibflags_for_target) libmysqld.a	; \
 		  rm -rf tmp; \
 		fi
 endif


Attachment: [text/bzr-bundle] bzr/joro@sun.com-20100212143716-13h7y4p6x6p8u9g0.bundle
Thread
bzr commit into mysql-pe branch (joro:3902) Bug#47416Georgi Kodinov12 Feb