diff --git a/CMakeLists.txt b/CMakeLists.txt index ab128d04adb10b601cb0c5e55c87e52c3bd3019d..a9e4d302ec26a55423e63bf5f3e5e94fbd3a0390 100644 --- a/CMakeLists.txt +++ b/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}") diff --git a/debian/changelog b/debian/changelog index 809bd6a9e8d259d026a7a43d3cdde3ee19aa7576..2357ce67f547a86edca74e1c07ea50c49589ec63 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +tarantool (1.4.4+20111228-2) unstable; urgency=low + + * Specify architectures. + + -- Dmitry E. Oboukhov <unera@debian.org> Wed, 28 Dec 2011 22:40:28 +0400 + tarantool (1.4.4+20111228-1) unstable; urgency=low * Fix build system for kFreeBSD. diff --git a/debian/control b/debian/control index 9267f9fb73e051f0fb398c59aad582f84d004a27..a2b07f4662abc267e1081fbfb40469cc60c3a789 100644 --- a/debian/control +++ b/debian/control @@ -32,7 +32,7 @@ Description: high performance key/value storage server This package provides configs and logs infrastructure for tarantool. Package: tarantool -Architecture: any +Architecture: i386 amd64 kfreebsd-i386 kfreebsd-amd64 hurd-i386 Priority: optional Depends: ${shlibs:Depends}, ${misc:Depends}, tarantool-common Description: high performance key/value storage server @@ -50,7 +50,7 @@ Description: high performance key/value storage server This package provides tarantool server. Package: tarantool-dbg -Architecture: any +Architecture: i386 amd64 kfreebsd-i386 kfreebsd-amd64 hurd-i386 Priority: extra Section: debug Depends: ${shlibs:Depends}, ${misc:Depends}, @@ -70,7 +70,7 @@ Description: high performance key/value storage server This package provides debug symbols for all tarantool packages. Package: tarantool-client -Architecture: any +Architecture: i386 amd64 kfreebsd-i386 kfreebsd-amd64 hurd-i386 Priority: optional Depends: ${shlibs:Depends}, ${misc:Depends} Description: high performance key/value storage server @@ -88,7 +88,7 @@ Description: high performance key/value storage server This package provides readline client for tarantool. Package: tarantool-client-dbg -Architecture: any +Architecture: i386 amd64 kfreebsd-i386 kfreebsd-amd64 hurd-i386 Priority: extra Section: debug Depends: ${shlibs:Depends}, ${misc:Depends}, diff --git a/debian/patches/kfreebsd-architecture b/debian/patches/kfreebsd-architecture new file mode 100644 index 0000000000000000000000000000000000000000..19f51239ce6288c559c41327c017b99eeb558c06 --- /dev/null +++ b/debian/patches/kfreebsd-architecture @@ -0,0 +1,37 @@ +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}") diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000000000000000000000000000000000000..4fdee1c8a56b5609891309a43454db522f85df38 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +kfreebsd-architecture diff --git a/debian/rules b/debian/rules index 11431d2964b459a955a38750cb764aefe65223dc..4ee03d1dfafc613a4631a6430edbc6f7ba9d3e64 100755 --- a/debian/rules +++ b/debian/rules @@ -16,7 +16,7 @@ DEB_CMAKE_NORMAL_ARGS := -DCMAKE_INSTALL_PREFIX="$(DEB_CMAKE_INSTALL_PREFIX)" \ -DCMAKE_SKIP_RPATH=ON \ -DCMAKE_VERBOSE_MAKEFILE=ON \ -DCMAKE_SYSCONF_DIR=/etc/tarantool \ - -DCMAKE_LOCALSTATE_DIR=/var/lib/tarantool + -DCMAKE_LOCALSTATE_DIR=/var # -DENABLE_STATIC=ON # -DCMAKE_C_COMPILER:FILEPATH="$(CC)" \ # -DCMAKE_CXX_COMPILER:FILEPATH="$(CXX)" \