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

remove debian/patches

parent c77c49f9
No related branches found
No related tags found
No related merge requests found
tarantool (1.4.4+20111228-4) unstable; urgency=low
tarantool (1.4.4+20111229-1) unstable; urgency=low
* Fix test box/args.test.
-- Dmitry E. Oboukhov <unera@debian.org> Thu, 29 Dec 2011 00:01:03 +0400
-- Dmitry E. Oboukhov <unera@debian.org> Thu, 29 Dec 2011 08:49:34 +0400
tarantool (1.4.4+20111228-3) unstable; urgency=low
......
--- tarantool-1.4.4+20111228.orig/test/box/args.result
+++ tarantool-1.4.4+20111228/test/box/args.result
@@ -12,6 +12,8 @@ Usage: tarantool_box [OPTIONS]
-v, --verbose increase verbosity level in log messages
-B, --background redirect input/output streams to a log file and run as
daemon
+ -l, --logger=LOGGER defines logger process (like the same config option)
+ -p, --pid_file=PIDFILE defines pid_file (like the same config option)
-h, --help display this help and exit
-V, --version print program version and exit
@@ -32,6 +34,8 @@ Usage: tarantool_box [OPTIONS]
-v, --verbose increase verbosity level in log messages
-B, --background redirect input/output streams to a log file and run as
daemon
+ -l, --logger=LOGGER defines logger process (like the same config option)
+ -p, --pid_file=PIDFILE defines pid_file (like the same config option)
-h, --help display this help and exit
-V, --version print program version and exit
--- 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}).")
Description: <short summary of the patch>
TODO: Put a short summary on the line above and replace this paragraph
with a longer explanation of this change. Complete the meta-information
with other relevant fields (see below for details). To make it easier, the
information below has been extracted from the changelog. Adjust it or drop
it.
.
tarantool (1.4.4+20111228-2) unstable; urgency=low
.
* Specify architectures.
Author: Dmitry E. Oboukhov <unera@debian.org>
---
The information above should follow the Patch Tagging Guidelines, please
checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
are templates for supplementary fields that you might want to add:
Origin: <vendor|upstream|other>, <url of original patch>
Bug: <url in upstream bugtracker>
Bug-Debian: http://bugs.debian.org/<bugnumber>
Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
Forwarded: <no|not-needed|url proving that it has been forwarded>
Reviewed-By: <name and email of someone who approved the patch>
Last-Update: <YYYY-MM-DD>
--- tarantool-1.4.4+20111228.orig/CMakeLists.txt
+++ tarantool-1.4.4+20111228/CMakeLists.txt
@@ -53,8 +53,7 @@ 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} STREQUAL "FreeBSD"
- or ${CMAKE_SYSTEM_NAME} STREQUAL "kFreeBSD")
+elseif (${CMAKE_SYSTEM_NAME} MATCHES "^k?FreeBSD$")
set(TARGET_OS_FREEBSD 1)
else()
message (FATAL_ERROR "Unsupported platform -- ${CMAKE_SYSTEM_NAME}")
kfreebsd-architecture
kfreebsd-and-amd64
boxargs.test
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