diff options
| author | Vladislav Vaintroub <vv221804@astra04> | 2010-01-27 01:50:19 +0100 |
|---|---|---|
| committer | Vladislav Vaintroub <vv221804@astra04> | 2010-01-27 01:50:19 +0100 |
| commit | 0a6fe4fb84f26436113fcfc81eee2bea4a702135 (patch) | |
| tree | d662e45424ab962bb70149d48ee808792a46f36c /configure.cmake | |
| parent | cdb8cafb2731578cef674de3f71ff65e9ac055ae (diff) | |
| download | mariadb-git-0a6fe4fb84f26436113fcfc81eee2bea4a702135.tar.gz | |
fix default architecture flag (v8) on sparc32 gcc that prevent mysql from compilng, add HPUX.cmake
Diffstat (limited to 'configure.cmake')
| -rw-r--r-- | configure.cmake | 29 |
1 files changed, 1 insertions, 28 deletions
diff --git a/configure.cmake b/configure.cmake index 663e3db9a66..016ae359486 100644 --- a/configure.cmake +++ b/configure.cmake @@ -79,37 +79,10 @@ ENDIF() # Large files SET(_LARGEFILE_SOURCE 1) -IF(CMAKE_SYSTEM_NAME STREQUAL "HP-UX") - SET(_LARGEFILE64_SOURCE 1) - SET(_FILE_OFFSET_BITS 64) -ENDIF() IF(CMAKE_SYSTEM_NAME MATCHES "AIX" OR CMAKE_SYSTEM_NAME MATCHES "OS400") SET(_LARGE_FILES 1) ENDIF() - - -IF(CMAKE_SYSTEM_NAME STREQUAL "HP-UX" ) - IF(CMAKE_SIZEOF_VOID_P EQUAL 4) - # HPUX linker crashes building plugins - SET(WITHOUT_DYNAMIC_PLUGINS TRUE) - ENDIF() - # If Itanium make shared library suffix .so - # OS understands both .sl and .so. CMake would - # use .sl, however MySQL prefers .so - IF(NOT CMAKE_SYSTEM_PROCESSOR MATCHES "9000") - SET(CMAKE_SHARED_LIBRARY_SUFFIX ".so" CACHE INTERNAL "" FORCE) - SET(CMAKE_SHARED_MODULE_SUFFIX ".so" CACHE INTERNAL "" FORCE) - ENDIF() -ENDIF() - - -#Some OS specific hacks -IF(CMAKE_SYSTEM MATCHES "HP-UX" AND CMAKE_SYSTEM MATCHES "11") - ADD_DEFINITIONS(-DHPUX11) -ENDIF() - - # Figure out what engines to build and how (statically or dynamically), # add preprocessor defines for storage engines. IF(WITHOUT_DYNAMIC_PLUGINS) @@ -952,7 +925,7 @@ CHECK_CXX_SOURCE_COMPILES_UNIX(" IF(WIN32) SET(HAVE_SOCKET_TIMEOUT 1) -ELSEIF(CMAKE_SYSTEM MATCHES "HP") +ELSEIF(CMAKE_SYSTEM MATCHES "HP-UX") SET(HAVE_SOCKET_TIMEOUT 0) ELSEIF(CMAKE_CROSSCOMPILING) SET(HAVE_SOCKET_TIMEOUT 0) |