Skip to content
Snippets Groups Projects
Commit 8f02ce52 authored by Dmitry E. Oboukhov's avatar Dmitry E. Oboukhov
Browse files

kfreebsd & amd64 (amd64 and x86_64 are the same). kfreebsd uses glibc

parent 0fd1d4be
No related branches found
No related tags found
No related merge requests found
......@@ -53,7 +53,15 @@ if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
# On 32-bit systems, support files larger than 2GB
# (see man page for feature_test_macros).
set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_FILE_OFFSET_BITS=64")
elseif (${CMAKE_SYSTEM_NAME} MATCHES "^k?FreeBSD$")
elseif (${CMAKE_SYSTEM_NAME} STREQUAL "kFreeBSD")
set(TARGET_OS_FREEBSD 1)
# Enable GNU glibc extentions.
set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_GNU_SOURCE")
#
# On 32-bit systems, support files larger than 2GB
# (see man page for feature_test_macros).
set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_FILE_OFFSET_BITS=64")
elseif (${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD")
set(TARGET_OS_FREEBSD 1)
else()
message (FATAL_ERROR "Unsupported platform -- ${CMAKE_SYSTEM_NAME}")
......@@ -210,7 +218,7 @@ addresses are printed." ${CMAKE_COMPILER_IS_GNUCC})
set (HAVE_BFD False)
if (ENABLE_BACKTRACE)
if (NOT ${CMAKE_COMPILER_IS_GNUCC} OR
NOT (${CMAKE_SYSTEM_PROCESSOR} MATCHES "86"))
NOT (${CMAKE_SYSTEM_PROCESSOR} MATCHES "86|amd64"))
# We only know this option to work with gcc
# on x86 architecture.
message (FATAL_ERROR "ENABLE_BACKTRACE option is set but the system is not x86 based (${CMAKE_SYSTEM_PROCESSOR}) or the compiler is not GNU GCC (${CMAKE_C_COMPILER}).")
......
tarantool (1.4.4+20111228-3) unstable; urgency=low
* kFreeBSD: uses glibc, amd64 is x86 architecture.
-- Dmitry E. Oboukhov <unera@debian.org> Wed, 28 Dec 2011 23:38:12 +0400
tarantool (1.4.4+20111228-2) unstable; urgency=low
* Specify architectures.
......
--- tarantool-1.4.4+20111228.orig/CMakeLists.txt
+++ tarantool-1.4.4+20111228/CMakeLists.txt
@@ -53,7 +53,15 @@ if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux
# On 32-bit systems, support files larger than 2GB
# (see man page for feature_test_macros).
set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_FILE_OFFSET_BITS=64")
-elseif (${CMAKE_SYSTEM_NAME} MATCHES "^k?FreeBSD$")
+elseif (${CMAKE_SYSTEM_NAME} STREQUAL "kFreeBSD")
+ set(TARGET_OS_FREEBSD 1)
+# Enable GNU glibc extentions.
+ set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_GNU_SOURCE")
+#
+# On 32-bit systems, support files larger than 2GB
+# (see man page for feature_test_macros).
+ set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_FILE_OFFSET_BITS=64")
+elseif (${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD")
set(TARGET_OS_FREEBSD 1)
else()
message (FATAL_ERROR "Unsupported platform -- ${CMAKE_SYSTEM_NAME}")
@@ -210,7 +218,7 @@ addresses are printed." ${CMAKE_COMPILER
set (HAVE_BFD False)
if (ENABLE_BACKTRACE)
if (NOT ${CMAKE_COMPILER_IS_GNUCC} OR
- NOT (${CMAKE_SYSTEM_PROCESSOR} MATCHES "86"))
+ NOT (${CMAKE_SYSTEM_PROCESSOR} MATCHES "86|amd64"))
# We only know this option to work with gcc
# on x86 architecture.
message (FATAL_ERROR "ENABLE_BACKTRACE option is set but the system is not x86 based (${CMAKE_SYSTEM_PROCESSOR}) or the compiler is not GNU GCC (${CMAKE_C_COMPILER}).")
kfreebsd-architecture
kfreebsd-and-amd64
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment