databases/tarantool: Update to 2.10.1

These patches are no longer needed:
patch-src-lib-tzcode-CMakeLists.txt - fixed in 4eaff4e05b
    (build: submodule third_party/tz instead of git)

patch-test-unit-CMakeLists.txt - fixed in 15b823f0ee
    (build: fix error on FreeBSD 13.1)

Signed-off-by: Pavel Balaev <balaev@tarantool.org>
This commit is contained in:
Pavel Balaev 2022-08-22 12:52:59 +03:00 committed by Gleb Popov
parent 7553b5ccfa
commit c47ed06557
5 changed files with 6 additions and 80 deletions

View file

@ -1,6 +1,5 @@
PORTNAME= tarantool
PORTVERSION= 2.10.0
PORTREVISION= 2
PORTVERSION= 2.10.1
CATEGORIES= databases
MASTER_SITES= https://download.tarantool.org/tarantool/src/
@ -16,7 +15,7 @@ NOT_FOR_ARCHS= armv6 powerpc64 sparc64
NOT_FOR_ARCHS_REASON= fails to build: Unsupported architecture
BUILD_DEPENDS= gsed:textproc/gsed \
msgpuck>=2.0_4:devel/msgpuck
msgpuck>=2.0_5:devel/msgpuck
LIB_DEPENDS= libcurl.so:ftp/curl \
libicui18n.so:devel/icu \
libmsgpuck.so:devel/msgpuck \

View file

@ -1,3 +1,3 @@
TIMESTAMP = 1653072329
SHA256 (tarantool-2.10.0.tar.gz) = 42bb5a714ddf788a89ba4b2062582aee16a2bc7b68c7c3b8c03d7a30be878e2b
SIZE (tarantool-2.10.0.tar.gz) = 45203838
TIMESTAMP = 1661154605
SHA256 (tarantool-2.10.1.tar.gz) = 615c9471ed4b4277427bd24b008a7ca7942da349d3391ba466823dab2bc34e6f
SIZE (tarantool-2.10.1.tar.gz) = 46704498

View file

@ -1,60 +0,0 @@
--- 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.

View file

@ -1,14 +0,0 @@
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)

View file

@ -72,6 +72,7 @@ share/man/man1/tarantoolctl.1.gz
%%DATADIR%%/luarocks/fetch/sscm.lua
%%DATADIR%%/luarocks/fetch/svn.lua
%%DATADIR%%/luarocks/fs.lua
%%DATADIR%%/luarocks/fs/freebsd.lua
%%DATADIR%%/luarocks/fs/lua.lua
%%DATADIR%%/luarocks/fs/tools.lua
%%DATADIR%%/luarocks/fs/unix.lua