Skip to content

Commit 9503a8e

Browse files
author
Alexander Nozdrin
committed
Manual merge from mysql-trunk.
Conflicts: - scripts/CMakeLists.txt
2 parents 83c154d + 226852e commit 9503a8e

16 files changed

+260
-76
lines changed

‎CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -165,9 +165,9 @@ IF(WITH_ERROR_INJECT)
165165
SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DERROR_INJECT_SUPPORT")
166166
ENDIF()
167167

168-
OPTION(ENABLE_LOCAL_INFILE
168+
OPTION(ENABLED_LOCAL_INFILE
169169
"If we should should enable LOAD DATA LOCAL by default" ${IF_WIN})
170-
MARK_AS_ADVANCED(ENABLE_LOCAL_INFILE)
170+
MARK_AS_ADVANCED(ENABLED_LOCAL_INFILE)
171171

172172
OPTION(WITH_FAST_MUTEXES "Compile with fast mutexes" OFF)
173173
MARK_AS_ADVANCED(WITH_FAST_MUTEXES)

‎cmake/build_configurations/mysql_release.cmake

+96-45
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,18 @@
1515

1616
# This file includes build settings used for MySQL release
1717

18+
INCLUDE(CheckIncludeFiles)
19+
INCLUDE(CheckLibraryExists)
20+
INCLUDE(CheckTypeSize)
21+
22+
# XXX package_name.cmake uses this too, move it somewhere global
23+
CHECK_TYPE_SIZE("void *" SIZEOF_VOIDP)
24+
IF(SIZEOF_VOIDP EQUAL 4)
25+
SET(32BIT 1)
26+
ENDIF()
27+
IF(SIZEOF_VOIDP EQUAL 8)
28+
SET(64BIT 1)
29+
ENDIF()
1830

1931
SET(FEATURE_SET "community" CACHE STRING
2032
" Selection of features. Options are
@@ -76,15 +88,14 @@ IF(FEATURE_SET)
7688
SET(WITH_${eng}_STORAGE_ENGINE OFF CACHE BOOL "")
7789
ELSE()
7890
SET(WITH_${eng}_STORAGE_ENGINE ON CACHE BOOL "")
79-
ENDIF()
91+
ENDIF()
8092
ENDFOREACH()
8193
ENDIF()
8294

83-
OPTION(ENABLE_LOCAL_INFILE "" ON)
95+
OPTION(ENABLED_LOCAL_INFILE "" ON)
8496
SET(WITH_SSL bundled CACHE STRING "")
8597
SET(WITH_ZLIB bundled CACHE STRING "")
8698

87-
8899
IF(NOT COMPILATION_COMMENT)
89100
SET(COMPILATION_COMMENT "MySQL Community Server (GPL)")
90101
ENDIF()
@@ -103,46 +114,75 @@ IF(UNIX)
103114
ENDIF()
104115

105116
OPTION(WITH_PIC "" ON) # Why?
106-
ENDIF()
107117

118+
# Ensure aio is available on Linux (required by InnoDB)
119+
IF(CMAKE_SYSTEM_NAME STREQUAL "Linux")
120+
CHECK_INCLUDE_FILES(libaio.h HAVE_LIBAIO_H)
121+
CHECK_LIBRARY_EXISTS(aio io_queue_init "" HAVE_LIBAIO)
122+
IF(NOT HAVE_LIBAIO_H OR NOT HAVE_LIBAIO)
123+
MESSAGE(FATAL_ERROR "aio is required on Linux")
124+
ENDIF()
125+
ENDIF()
126+
127+
ENDIF()
108128

109129
# Compiler options
110130
IF(UNIX)
131+
111132
# Default GCC flags
133+
IF(CMAKE_COMPILER_IS_GNUCC)
134+
SET(COMMON_C_FLAGS "-g -static-libgcc -fno-omit-frame-pointer")
135+
SET(CMAKE_C_FLAGS_DEBUG "-O ${COMMON_C_FLAGS}")
136+
SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-O3 ${COMMON_C_FLAGS}")
137+
ENDIF()
112138
IF(CMAKE_COMPILER_IS_GNUCXX)
113-
SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-g -O3 -static-libgcc -fno-omit-frame-pointer")
114-
SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-g -O3 -static-libgcc -fno-omit-frame-pointer -felide-constructors -fno-exceptions -fno-rtti")
139+
SET(COMMON_CXX_FLAGS "-g -static-libgcc -fno-omit-frame-pointer")
140+
SET(CMAKE_CXX_FLAGS_DEBUG "-O ${COMMON_CXX_FLAGS}")
141+
SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O3 ${COMMON_CXX_FLAGS}")
115142
ENDIF()
116-
117143

118144
# HPUX flags
119145
IF(CMAKE_SYSTEM_NAME MATCHES "HP-UX")
120146
IF(CMAKE_C_COMPILER_ID MATCHES "HP")
121147
IF(CMAKE_SYSTEM_PROCESSOR MATCHES "ia64")
122-
SET(CMAKE_C_FLAGS
123-
"${CMAKE_C_FLAGS} +DD64 +DSitanium2 -mt -AC99")
124-
SET(CMAKE_CXX_FLAGS
125-
"${CMAKE_CXX_FLAGS} +DD64 +DSitanium2 -mt -Aa")
126-
SET(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS} +O2")
127-
SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS} +O2")
148+
SET(COMMON_C_FLAGS "+DSitanium2 -mt -AC99")
149+
SET(COMMON_CXX_FLAGS "+DSitanium2 -mt -Aa")
150+
SET(CMAKE_C_FLAGS_DEBUG "+O0 -g ${COMMON_C_FLAGS}")
151+
SET(CMAKE_CXX_FLAGS_DEBUG "+O0 -g ${COMMON_CXX_FLAGS}")
152+
# We have seen compiler bugs with optimisation and -g, so disabled for now
153+
SET(CMAKE_C_FLAGS_RELWITHDEBINFO "+O2 ${COMMON_C_FLAGS}")
154+
SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "+O2 ${COMMON_CXX_FLAGS}")
128155
ENDIF()
129156
ENDIF()
130-
SET(WITH_SSL)
157+
SET(WITH_SSL no)
131158
ENDIF()
132159

133160
# Linux flags
134161
IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
135162
IF(CMAKE_C_COMPILER_ID MATCHES "Intel")
136-
SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-static-intel -static-libgcc -g -O3 -unroll2 -ip -mp -restrict -no-ftz -no-prefetch")
137-
SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-static-intel -static-libgcc -g -O3 -unroll2 -ip -mp -restrict -no-ftz -no-prefetch")
163+
SET(COMMON_C_FLAGS "-static-intel -static-libgcc -g -mp -restrict")
164+
SET(COMMON_CXX_FLAGS "-static-intel -static-libgcc -g -mp -restrict -fno-exceptions -fno-rtti")
165+
IF(CMAKE_SYSTEM_PROCESSOR MATCHES "ia64")
166+
SET(COMMON_C_FLAGS "${COMMON_C_FLAGS} -no-ftz -no-prefetch")
167+
SET(COMMON_CXX_FLAGS "${COMMON_CXX_FLAGS} -no-ftz -no-prefetch")
168+
ENDIF()
169+
SET(CMAKE_C_FLAGS_DEBUG "${COMMON_C_FLAGS}")
170+
SET(CMAKE_CXX_FLAGS_DEBUG "${COMMON_CXX_FLAGS}")
171+
SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-O3 -unroll2 -ip ${COMMON_C_FLAGS}")
172+
SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O3 -unroll2 -ip ${COMMON_CXX_FLAGS}")
138173
SET(WITH_SSL no)
139174
ENDIF()
140175
ENDIF()
141176

142177
# OSX flags
143178
IF(APPLE)
144-
SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-g -Os -fno-common")
145-
SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-g -Os -felide-constructors -fno-common")
179+
SET(COMMON_C_FLAGS "-g -fno-common")
180+
# XXX: why are we using -felide-constructors on OSX?
181+
SET(COMMON_CXX_FLAGS "-g -fno-common -felide-constructors")
182+
SET(CMAKE_C_FLAGS_DEBUG "-O ${COMMON_C_FLAGS}")
183+
SET(CMAKE_CXX_FLAGS_DEBUG "-O ${COMMON_CXX_FLAGS}")
184+
SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-Os ${COMMON_C_FLAGS}")
185+
SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-Os ${COMMON_CXX_FLAGS}")
146186
ENDIF()
147187

148188
# Solaris flags
@@ -153,37 +193,48 @@ IF(UNIX)
153193
ENDIF()
154194
IF(CMAKE_C_COMPILER_ID MATCHES "SunPro")
155195
IF(CMAKE_SYSTEM_PROCESSOR MATCHES "i386")
156-
IF(CMAKE_SIZEOF_VOID_P EQUAL 4)
157-
# Solaris x86
158-
SET(CMAKE_C_FLAGS_RELWITHDEBINFO
159-
"-g -xO2 -mt -fsimple=1 -ftrap=%none -nofstore -xbuiltin=%all -xlibmil -xlibmopt -xtarget=generic")
160-
SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO
161-
"-g0 -xO2 -mt -fsimple=1 -ftrap=%none -nofstore -xbuiltin=%all -features=no%except -xlibmil -xlibmopt -xtarget=generic")
162-
ELSE()
163-
# Solaris x64
164-
SET(CMAKE_C_FLAGS_RELWITHDEBINFO
165-
"-g -xO3 -mt -fsimple=1 -ftrap=%none -nofstore -xbuiltin=%all -xlibmil -xlibmopt -xtarget=generic")
166-
SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO
167-
"-g0 -xO3 -mt -fsimple=1 -ftrap=%none -nofstore -xbuiltin=%all -features=no%except -xlibmil -xlibmopt -xtarget=generic")
168-
ENDIF()
169-
ELSE()
170-
IF(CMAKE_SIZEOF_VOID_P EQUAL 4)
171-
# Solaris sparc 32 bit
172-
SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-g -xO3 -Xa -xstrconst -mt -xarch=sparc")
173-
SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-g0 -xO3 -noex -mt -xarch=sparc")
174-
ELSE()
175-
# Solaris sparc 64 bit
176-
SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-g -xO3 -Xa -xstrconst -mt")
177-
SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-g0 -xO3 -noex -mt")
178-
ENDIF()
179-
ENDIF()
196+
SET(COMMON_C_FLAGS "-g -mt -fsimple=1 -ftrap=%none -nofstore -xbuiltin=%all -xlibmil -xlibmopt -xtarget=generic")
197+
SET(COMMON_CXX_FLAGS "-g0 -mt -fsimple=1 -ftrap=%none -nofstore -xbuiltin=%all -xlibmil -xlibmopt -xtarget=generic")
198+
SET(CMAKE_C_FLAGS_DEBUG "${COMMON_C_FLAGS}")
199+
SET(CMAKE_CXX_FLAGS_DEBUG "${COMMON_CXX_FLAGS}")
200+
IF(32BIT)
201+
SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-xO2 ${COMMON_C_FLAGS}")
202+
SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-xO2 ${COMMON_CXX_FLAGS}")
203+
ELSEIF(64BIT)
204+
SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-xO3 ${COMMON_C_FLAGS}")
205+
SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-xO3 ${COMMON_CXX_FLAGS}")
206+
ENDIF()
207+
ELSE()
208+
# Assume !x86 is SPARC
209+
SET(COMMON_C_FLAGS "-g -Xa -xstrconst -mt")
210+
SET(COMMON_CXX_FLAGS "-g0 -noex -mt")
211+
IF(32BIT)
212+
SET(COMMON_C_FLAGS "${COMMON_C_FLAGS} -xarch=sparc")
213+
SET(COMMON_CXX_FLAGS "${COMMON_CXX_FLAGS} -xarch=sparc")
214+
ENDIF()
215+
SET(CMAKE_C_FLAGS_DEBUG "${COMMON_C_FLAGS}")
216+
SET(CMAKE_CXX_FLAGS_DEBUG "${COMMON_CXX_FLAGS}")
217+
SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-xO3 ${COMMON_C_FLAGS}")
218+
SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-xO3 ${COMMON_CXX_FLAGS}")
219+
ENDIF()
180220
ENDIF()
181221
ENDIF()
182222

223+
IF(CMAKE_C_FLAGS_DEBUG)
224+
SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG}"
225+
CACHE STRING "Debug C compile flags")
226+
ENDIF()
227+
IF(CMAKE_CXX_FLAGS_DEBUG)
228+
SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}"
229+
CACHE STRING "Debug C++ compile flags")
230+
ENDIF()
231+
IF(CMAKE_C_FLAGS_RELWITHDEBINFO)
232+
SET(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO}"
233+
CACHE STRING "RelWithDebInfo C compile flags")
234+
ENDIF()
183235
IF(CMAKE_CXX_FLAGS_RELWITHDEBINFO)
184236
SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO}"
185-
CACHE STRING "Compile flags")
186-
SET(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO}"
187-
CACHE STRING "Compile flags")
237+
CACHE STRING "RelWithDebInfo C++ compile flags")
188238
ENDIF()
239+
189240
ENDIF()

‎cmake/cpack_source_ignore_files.cmake

+1
Original file line numberDiff line numberDiff line change
@@ -36,5 +36,6 @@ include/config\\\\.h$
3636
include/my_config\\\\.h$
3737
/autom4te\\\\.cache/
3838
errmsg\\\\.sys$
39+
storage/ndb/
3940
#
4041
)

‎cmake/make_dist.cmake.in

+2
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,8 @@ IF(BZR_EXECUTABLE)
5353
RESULT_VARIABLE RESULT
5454
)
5555

56+
FILE(REMOVE_RECURSE ${PACKAGE_DIR}/storage/ndb)
57+
5658
IF(NOT RESULT EQUAL 0)
5759
SET(BZR_EXECUTABLE)
5860
ENDIF()

‎cmake/os/AIX.cmake

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,6 @@ INCLUDE(CheckCXXCompilerFlag)
2828
# The following is required to export all symbols
2929
# (also with leading underscore)
3030
STRING(REPLACE "-bexpall" "-bexpfull" CMAKE_SHARED_LIBRARY_LINK_CXX_FLAGS
31-
${CMAKE_SHARED_LIBRARY_LINK_CXX_FLAGS}")
31+
"${CMAKE_SHARED_LIBRARY_LINK_CXX_FLAGS}")
3232
STRING(REPLACE "-bexpall" "-bexpfull" CMAKE_SHARED_LIBRARY_LINK_C_FLAGS
33-
"${CMAKE_SHARED_LIBRARY_LINK_C_FLAGS}")
33+
"${CMAKE_SHARED_LIBRARY_LINK_C_FLAGS}")

‎cmake/os/WindowsCache.cmake

-1
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,6 @@ SET(HAVE_SYS_DIR_H CACHE INTERNAL "")
262262
SET(HAVE_SYS_ERRLIST CACHE INTERNAL "")
263263
SET(HAVE_SYS_FILE_H CACHE INTERNAL "")
264264
SET(HAVE_SYS_FPU_H CACHE INTERNAL "")
265-
SET(HAVE_SYS_IOCTL CACHE INTERNAL "")
266265
SET(HAVE_SYS_IOCTL_H CACHE INTERNAL "")
267266
SET(HAVE_SYS_IPC_H CACHE INTERNAL "")
268267
SET(HAVE_SYS_MALLOC_H CACHE INTERNAL "")

‎cmake/ssl.cmake

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,14 @@ MACRO (MYSQL_USE_BUNDLED_SSL)
2929
CHANGE_SSL_SETTINGS("bundled")
3030
#Remove -fno-implicit-templates
3131
#(yassl sources cannot be compiled with it)
32-
SET(SAVE_CXX_FLAGS ${CXX_FLAGS})
32+
SET(SAVE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
3333
IF(CMAKE_CXX_FLAGS)
3434
STRING(REPLACE "-fno-implicit-templates" "" CMAKE_CXX_FLAGS
3535
${CMAKE_CXX_FLAGS})
3636
ENDIF()
3737
ADD_SUBDIRECTORY(extra/yassl)
3838
ADD_SUBDIRECTORY(extra/yassl/taocrypt)
39-
SET(CXX_FLAGS ${SAVE_CXX_FLAGS})
39+
SET(CMAKE_CXX_FLAGS ${SAVE_CXX_FLAGS})
4040
GET_TARGET_PROPERTY(src yassl SOURCES)
4141
FOREACH(file ${src})
4242
SET(SSL_SOURCES ${SSL_SOURCES} ${CMAKE_SOURCE_DIR}/extra/yassl/${file})

‎config.h.cmake

+39
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,14 @@
2222
#cmakedefine HAVE_ALLOCA_H 1
2323
#cmakedefine HAVE_AIO_H 1
2424
#cmakedefine HAVE_ARPA_INET_H 1
25+
#cmakedefine HAVE_ASM_MSR_H 1
26+
#cmakedefine HAVE_ASM_TERMBITS_H 1
2527
#cmakedefine HAVE_BSEARCH 1
2628
#cmakedefine HAVE_CRYPT_H 1
2729
#cmakedefine HAVE_CURSES_H 1
2830
#cmakedefine HAVE_CXXABI_H 1
2931
#cmakedefine HAVE_NCURSES_H 1
32+
#cmakedefine HAVE_NDIR_H 1
3033
#cmakedefine HAVE_DIRENT_H 1
3134
#cmakedefine HAVE_DLFCN_H 1
3235
#cmakedefine HAVE_EXECINFO_H 1
@@ -70,6 +73,7 @@
7073
#cmakedefine HAVE_SYS_IPC_H 1
7174
#cmakedefine HAVE_SYS_MALLOC_H 1
7275
#cmakedefine HAVE_SYS_MMAN_H 1
76+
#cmakedefine HAVE_SYS_NDIR_H 1
7377
#cmakedefine HAVE_SYS_PTE_H 1
7478
#cmakedefine HAVE_SYS_PTEM_H 1
7579
#cmakedefine HAVE_SYS_PRCTL_H 1
@@ -87,6 +91,7 @@
8791
#cmakedefine HAVE_SYS_UN_H 1
8892
#cmakedefine HAVE_SYS_VADVISE_H 1
8993
#cmakedefine HAVE_TERM_H 1
94+
#cmakedefine HAVE_TERMBITS_H 1
9095
#cmakedefine HAVE_TERMIOS_H 1
9196
#cmakedefine HAVE_TERMIO_H 1
9297
#cmakedefine HAVE_TERMCAP_H 1
@@ -98,6 +103,7 @@
98103
#cmakedefine HAVE_SYS_UTIME_H 1
99104
#cmakedefine HAVE_SYS_WAIT_H 1
100105
#cmakedefine HAVE_SYS_PARAM_H 1
106+
#cmakedefine HAVE_XFS_XFS_H 1
101107

102108
/* Libraries */
103109
#cmakedefine HAVE_LIBPTHREAD 1
@@ -129,9 +135,11 @@
129135
#cmakedefine HAVE_BMOVE 1
130136
#cmakedefine HAVE_BZERO 1
131137
#cmakedefine HAVE_INDEX 1
138+
#cmakedefine HAVE_CHOWN 1
132139
#cmakedefine HAVE_CLOCK_GETTIME 1
133140
#cmakedefine HAVE_CRYPT 1
134141
#cmakedefine HAVE_CUSERID 1
142+
#cmakedefine HAVE_CXX_NEW 1
135143
#cmakedefine HAVE_DIRECTIO 1
136144
#cmakedefine HAVE_DLERROR 1
137145
#cmakedefine HAVE_DLOPEN 1
@@ -146,6 +154,7 @@
146154
#cmakedefine HAVE_FPSETMASK 1
147155
#cmakedefine HAVE_FSEEKO 1
148156
#cmakedefine HAVE_FSYNC 1
157+
#cmakedefine HAVE_FTIME 1
149158
#cmakedefine HAVE_GETADDRINFO 1
150159
#cmakedefine HAVE_GETCWD 1
151160
#cmakedefine HAVE_GETHOSTBYADDR_R 1
@@ -175,6 +184,8 @@
175184
#cmakedefine HAVE_LOG2 1
176185
#cmakedefine HAVE_LONGJMP 1
177186
#cmakedefine HAVE_LSTAT 1
187+
#cmakedefine HAVE_MEMALIGN 1
188+
/* #cmakedefine HAVE_MLOCK 1 see Bug#54662 */
178189
#cmakedefine HAVE_NPTL 1
179190
#cmakedefine HAVE_NL_LANGINFO 1
180191
#cmakedefine HAVE_MADVISE 1
@@ -195,6 +206,8 @@
195206
#cmakedefine HAVE_PREAD 1
196207
#cmakedefine HAVE_PAUSE_INSTRUCTION 1
197208
#cmakedefine HAVE_FAKE_PAUSE_INSTRUCTION 1
209+
#cmakedefine HAVE_RDTSCLL 1
210+
#cmakedefine HAVE_READ_REAL_TIME 1
198211
#cmakedefine HAVE_PTHREAD_ATTR_CREATE 1
199212
#cmakedefine HAVE_PTHREAD_ATTR_GETSTACKSIZE 1
200213
#cmakedefine HAVE_PTHREAD_ATTR_SETPRIO 1
@@ -239,6 +252,15 @@
239252
#cmakedefine HAVE_SIGWAIT 1
240253
#cmakedefine HAVE_SLEEP 1
241254
#cmakedefine HAVE_SNPRINTF 1
255+
/* Some that currently are not real defines, internal to CMake setup */
256+
/* #cmakedefine HAVE_FCNTL_NONBLOCK 1 */
257+
/* #cmakedefine HAVE_FINITE_IN_MATH_H 1 */
258+
/* #cmakedefine HAVE_SOCKADDR_STORAGE_SS_FAMILY 1 */
259+
/* #cmakedefine HAVE_SOCKADDR_STORAGE___SS_FAMILY 1 */
260+
/* #cmakedefine HAVE_SOCKET_SIZE_T_AS_int 1 */
261+
/* #cmakedefine HAVE_SOCKET_SIZE_T_AS_size_t 1 */
262+
/* #cmakedefine HAVE_SOCKET_SIZE_T_AS_socklen_t */
263+
/* #cmakedefine HAVE_SOCKET_TIMEOUT */
242264
#cmakedefine HAVE_STPCPY 1
243265
#cmakedefine HAVE_STRERROR 1
244266
#cmakedefine HAVE_STRCOLL 1
@@ -559,6 +581,23 @@
559581
#cmakedefine HAVE_UCA_COLLATIONS 1
560582
#cmakedefine HAVE_COMPRESS 1
561583

584+
/*
585+
Hard coded platform settings
586+
*/
587+
588+
/* This is ugly, but we need lots of tweaks for HP-UX */
589+
#cmakedefine HPUX11 1
590+
#cmakedefine DO_NOT_REMOVE_THREAD_WRAPPERS 1
591+
#cmakedefine HAVE_BROKEN_PREAD 1
592+
#cmakedefine HAVE_BROKEN_PTHREAD_COND_TIMEDWAIT 1
593+
#cmakedefine SNPRINTF_RETURN_TRUNC 1
594+
#cmakedefine _INCLUDE_LONGLONG 1
595+
596+
/* Mac OS X */
597+
#cmakedefine SIGNALS_DONT_BREAK_READ 1
598+
#cmakedefine IGNORE_SIGHUP_SIGQUIT 1
599+
#cmakedefine _P1003_1B_VISIBLE 1
600+
#cmakedefine DONT_DECLARE_CXA_PURE_VIRTUAL 1
562601

563602
/*
564603
Stuff that always need to be defined (compile breaks without it)

0 commit comments

Comments
 (0)