List:Commits« Previous MessageNext Message »
From:Georgi Kodinov Date:April 28 2011 10:17am
Subject:bzr push into mysql-5.5 branch (Georgi.Kodinov:3474 to 3475) Bug#11760838
View as plain text  
 3475 Georgi Kodinov	2011-04-28
      Backport of (part of) bug #11760838 to 5.5.
      Enabled the ABI check to run on MacOSX.

    modified:
      cmake/abi_check.cmake
 3474 Georgi Kodinov	2011-04-28
      Fixed the ABI check files after the push of bug # 12325444.

    modified:
      include/mysql/client_plugin.h.pp
=== modified file 'cmake/abi_check.cmake'
--- a/cmake/abi_check.cmake	2010-10-13 15:11:29 +0000
+++ b/cmake/abi_check.cmake	2011-04-28 10:13:36 +0000
@@ -19,8 +19,16 @@
 # plugin_audit.h and plugin_ftparser.h.
 #
 # We use gcc specific preprocessing command and sed/diff, so it will 
-# only be run  on Unix and only if gcc is used.
-IF(CMAKE_COMPILER_IS_GNUCC AND CMAKE_SYSTEM_NAME MATCHES "Linux")
+# only be run  on Unix and only if gcc is used. On some Unixes,
+# (Solaris) sed or diff might act differently from GNU, so we run only 
+# on systems we can trust.
+IF(APPLE OR CMAKE_SYSTEM_NAME MATCHES "Linux")
+ SET(RUN_ABI_CHECK 1)
+ELSE()
+ SET(RUN_ABI_CHECK 0)
+ENDIF()
+
+IF(CMAKE_COMPILER_IS_GNUCC AND RUN_ABI_CHECK)
   IF(CMAKE_C_COMPILER MATCHES "ccache$")
     SET(COMPILER ${CMAKE_C_COMPILER_ARG1})
     STRING(REGEX REPLACE "^ " "" COMPILER ${COMPILER})

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-5.5 branch (Georgi.Kodinov:3474 to 3475) Bug#11760838Georgi Kodinov28 Apr