=== modified file 'Percona-Server/cmake/dtrace.cmake'
--- Percona-Server/cmake/dtrace.cmake 2012-06-15 01:35:09 +0000
+++ Percona-Server/cmake/dtrace.cmake 2013-02-20 13:49:12 +0000
@@ -38,6 +38,8 @@
IF(DTRACE AND NOT CMAKE_SYSTEM_NAME MATCHES "FreeBSD"
AND NOT BUGGY_GCC_NO_DTRACE_MODULES)
SET(ENABLE_DTRACE ON CACHE BOOL "Enable dtrace")
+ ELSE()
+ SET(ENABLE_DTRACE OFF CACHE BOOL "Enable dtrace" FORCE)
ENDIF()
SET(HAVE_DTRACE ${ENABLE_DTRACE})
IF(CMAKE_SYSTEM_NAME MATCHES "SunOS")
Note: If systemtap is installed on system (with /usr/bin/dtrace)
present and -DENABLE_DTRACE=ON is passed, it will still fail.
So, atleast the workaround will work.
This is patch is consolidation of ones above:
=== modified file 'Percona- Server/ CMakeLists. txt' Server/ CMakeLists. txt 2013-02-06 06:10:43 +0000 Server/ CMakeLists. txt 2013-02-20 12:53:32 +0000
--- Percona-
+++ Percona-
@@ -150,6 +150,7 @@
ENDIF()
ENDIF()
+OPTION( ENABLE_ DTRACE "Enable Dtrace profiling" OFF) character_ sets)
# Add macros
INCLUDE(
INCLUDE(zlib)
=== modified file 'Percona- Server/ cmake/dtrace. cmake' Server/ cmake/dtrace. cmake 2012-06-15 01:35:09 +0000 Server/ cmake/dtrace. cmake 2013-02-20 13:49:12 +0000 NO_DTRACE_ MODULES) ENABLE_ DTRACE ON CACHE BOOL "Enable dtrace") SYSTEM_ NAME MATCHES "SunOS")
--- Percona-
+++ Percona-
@@ -38,6 +38,8 @@
IF(DTRACE AND NOT CMAKE_SYSTEM_NAME MATCHES "FreeBSD"
AND NOT BUGGY_GCC_
SET(
+ ELSE()
+ SET(ENABLE_DTRACE OFF CACHE BOOL "Enable dtrace" FORCE)
ENDIF()
SET(HAVE_DTRACE ${ENABLE_DTRACE})
IF(CMAKE_
Note: If systemtap is installed on system (with /usr/bin/dtrace)
present and -DENABLE_DTRACE=ON is passed, it will still fail.
So, atleast the workaround will work.