MASTER_SITES=	https://download.tarantool.org/tarantool/src/

--- cmake/BuildLibUnwind.cmake.orig	2022-05-21 03:40:03.175123000 +0300

+++ cmake/BuildLibUnwind.cmake	2022-05-21 03:40:11.327052000 +0300

@@ -18,6 +18,11 @@

   The paths to the libunwind libraries.

 #]========================================================================]

+set(SYSTEM_ARCH ${CMAKE_SYSTEM_PROCESSOR})

+if(CMAKE_SYSTEM_NAME STREQUAL FreeBSD AND SYSTEM_ARCH STREQUAL amd64)

+	set(SYSTEM_ARCH x86_64)

+endif()

+

 macro(libunwind_build)

     set(LIBUNWIND_SOURCE_DIR ${PROJECT_SOURCE_DIR}/third_party/libunwind)

     set(LIBUNWIND_BUILD_DIR ${PROJECT_BINARY_DIR}/build/libunwind)

@@ -81,12 +86,12 @@

     add_library(bundled-libunwind-platform STATIC IMPORTED GLOBAL)

     set_target_properties(bundled-libunwind-platform PROPERTIES

                           IMPORTED_LOCATION

-                          ${LIBUNWIND_INSTALL_DIR}/lib/libunwind-${CMAKE_SYSTEM_PROCESSOR}.a)

+			  ${LIBUNWIND_INSTALL_DIR}/lib/libunwind-${SYSTEM_ARCH}.a)

     add_dependencies(bundled-libunwind-platform bundled-libunwind-project)

     set(LIBUNWIND_INCLUDE_DIR ${LIBUNWIND_INSTALL_DIR}/include)

     set(LIBUNWIND_LIBRARIES

-        ${LIBUNWIND_INSTALL_DIR}/lib/libunwind-${CMAKE_SYSTEM_PROCESSOR}.a

+	    ${LIBUNWIND_INSTALL_DIR}/lib/libunwind-${SYSTEM_ARCH}.a

         ${LIBUNWIND_INSTALL_DIR}/lib/libunwind.a)

     message(STATUS "Using bundled libunwind")

--- src/lib/tzcode/CMakeLists.txt.orig	2022-05-24 21:51:37.355897000 +0300

+++ src/lib/tzcode/CMakeLists.txt	2022-05-24 21:55:26.136676000 +0300

@@ -1,57 +1,3 @@

 add_library(tzcode STATIC

             strftime.c strptime.c timelocal.c localtime.c timezone.c)

 target_link_libraries(tzcode)

-

-set(TZCODE_PROJECT tzcode-iana)

-set(TZCODE_BUILD_DIR ${CMAKE_CURRENT_BINARY_DIR})

-set(TZCODE_PREFIX_DIR tz)

-set(TZCODE_PREFIX ${TZCODE_BUILD_DIR}/${TZCODE_PREFIX_DIR})

-set(TZDATA_TARGET main.zi)

-set(TZCODE_SRC ${PROJECT_SOURCE_DIR}/src/lib/tzcode)

-set(TZLUA_SRC ${PROJECT_SOURCE_DIR}/src/lua)

-

-set(TZDATA_FULL_TARGET

-    ${TZCODE_PREFIX}/src/${TZCODE_PROJECT}/${TZDATA_TARGET})

-

-ExternalProject_Add(${TZCODE_PROJECT}

-    GIT_REPOSITORY https://github.com/tarantool/tz

-    GIT_TAG 2022a

-    GIT_SHALLOW YES

-

-    EXCLUDE_FROM_ALL 1

-    INSTALL_DIR ${TZCODE_BUILD_DIR}/install

-    PREFIX ${TZCODE_PREFIX_DIR}

-

-    UPDATE_COMMAND ""

-    CONFIGURE_COMMAND ""

-

-    BUILD_COMMAND ${CMAKE_COMMAND} -E env

-        CC=${CMAKE_C_COMPILER}

-        CFLAGS=${CMAKE_C_FLAGS}

-        PACKRATDATA=backzone

-        make -C <SOURCE_DIR> ${TZDATA_TARGET}

-    BUILD_IN_SOURCE TRUE

-    TEST_COMMAND ""

-    INSTALL_COMMAND make DESTDIR=<INSTALL_DIR> install

-    BUILD_BYPRODUCTS ${TZDATA_FULL_TARGET}

-)

-

-find_program(PERL perl)

-

-add_custom_target(gen-timezones DEPENDS ${TZCODE_PROJECT})

-add_custom_command(TARGET gen-timezones

-    COMMAND

-    ${PERL} ${TZCODE_SRC}/gen-zone-abbrevs.pl

-        ${TZCODE_SRC}/zone-abbrevs.txt ${TZDATA_FULL_TARGET}

-        ${TZCODE_SRC}/timezones.h ${TZLUA_SRC}/timezones.lua

-    COMMENT "Generating timezones.h and timezones.lua"

-)

-

-# We excluded build of gen-timezones and tzcode-iana (main.zi) targets

-# from ALL dependencies (see EXCLUDE_FROM_ALL=1) if you, by either reason

-# need to regenerate timezones.h then invoke target manually:

-# ```sh

-#   make gen-timezones VERBOSE=1

-# ```

-# it will regenerate `timezones.h`, `timezones.lua` in-place, in their

-# repository location.

diff --git a/test/unit/CMakeLists.txt b/test/unit/CMakeLists.txt

index 442597255..1207beff5 100644

--- test/unit/CMakeLists.txt.orig

+++ test/unit/CMakeLists.txt

@@ -297,7 +297,8 @@ target_link_libraries(popen.test misc unit core)

 add_executable(serializer.test serializer.c box_test_utils.c)

 target_link_libraries(serializer.test unit box ${LUAJIT_LIBRARIES})

-add_executable(watcher.test watcher.c)

+add_executable(watcher.test watcher.c

+	${PROJECT_SOURCE_DIR}/test/unit/box_test_utils.c)

 target_link_libraries(watcher.test unit box)

 add_executable(grp_alloc.test grp_alloc.c box_test_utils.c)