git: 345ae501c467 - main - databases/tarantool: Update to 2.10.0
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 09 Jun 2022 11:05:24 UTC
The branch main has been updated by sunpoet:
URL: https://cgit.FreeBSD.org/ports/commit/?id=345ae501c46756d919d0eac48be1df220e2a8953
commit 345ae501c46756d919d0eac48be1df220e2a8953
Author: Pavel Balaev <balaev@tarantool.org>
AuthorDate: 2022-06-09 11:00:42 +0000
Commit: Po-Chuan Hsieh <sunpoet@FreeBSD.org>
CommitDate: 2022-06-09 11:00:42 +0000
databases/tarantool: Update to 2.10.0
- Update MASTER_SITES: use upstream release tarball
- Pass maintainership to upstream developer
Changes: https://github.com/tarantool/tarantool/releases
https://www.tarantool.io/en/doc/latest/release/notes/
PR: 264223
---
databases/tarantool/Makefile | 14 ++---
databases/tarantool/distinfo | 18 ++-----
.../files/patch-cmake-BuildLibUnwind.cmake | 29 +++++++++++
.../tarantool/files/patch-cmake-BuildMisc.cmake | 17 ------
.../tarantool/files/patch-cmake-FindICONV.cmake | 11 ----
.../files/patch-src-lib-tzcode-CMakeLists.txt | 60 ++++++++++++++++++++++
.../tarantool/files/patch-test-unit-CMakeLists.txt | 14 +++++
7 files changed, 109 insertions(+), 54 deletions(-)
diff --git a/databases/tarantool/Makefile b/databases/tarantool/Makefile
index a7024d3ddf2b..05f808fb8ae0 100644
--- a/databases/tarantool/Makefile
+++ b/databases/tarantool/Makefile
@@ -1,11 +1,11 @@
# Created by: Veniamin Gvozdikov <vg@FreeBSD.org>
PORTNAME= tarantool
-PORTVERSION= 2.8.4
-PORTREVISION= 1
+PORTVERSION= 2.10.0
CATEGORIES= databases
+MASTER_SITES= https://download.tarantool.org/tarantool/src/
-MAINTAINER= sunpoet@FreeBSD.org
+MAINTAINER= balaev@tarantool.org
COMMENT= NoSQL database running in a Lua application server
LICENSE= BSD2CLAUSE
@@ -46,14 +46,6 @@ PLIST_SUB= TT_DATADIR=${TT_DATADIR} \
TT_LOGDIR=${TT_LOGDIR}
SUB_FILES= pkg-message
-GH_TUPLE= luafun:luafun:f126f9c:luafun_luafun/third_party/luafun \
- tarantool:decNumber:5ddfde1:tarantool_decNumber/third_party/decNumber \
- tarantool:luajit:8304ca9:tarantool_luajit/third_party/luajit \
- tarantool:luarocks:954c2f5:tarantool_luarocks/third_party/luarocks \
- tarantool:small:781fd38:tarantool_small/src/lib/small \
- tarantool:test-run:d16cbdc:tarantool_test_run/test-run
-USE_GITHUB= yes
-
TT_DATADIR?= /var/db/tarantool
TT_LOGDIR?= /var/log/tarantool
TT_RUNDIR?= /var/run/tarantool
diff --git a/databases/tarantool/distinfo b/databases/tarantool/distinfo
index 869cd25be947..fcf280ddef9a 100644
--- a/databases/tarantool/distinfo
+++ b/databases/tarantool/distinfo
@@ -1,15 +1,3 @@
-TIMESTAMP = 1650970033
-SHA256 (tarantool-tarantool-2.8.4_GH0.tar.gz) = aba51a9e173b875898b2ac601e8940444f6fa22ad508d8fe898dc977742a4f11
-SIZE (tarantool-tarantool-2.8.4_GH0.tar.gz) = 7559481
-SHA256 (luafun-luafun-f126f9c_GH0.tar.gz) = 406213098afe81f8621c136e1efedc72f59bd9ffbfbfdb081c1dd722cbf12c4a
-SIZE (luafun-luafun-f126f9c_GH0.tar.gz) = 63029
-SHA256 (tarantool-decNumber-5ddfde1_GH0.tar.gz) = 3518875bff0e0a4d5751d72b52152163c894a1e9c0a6311ae637bece338ede65
-SIZE (tarantool-decNumber-5ddfde1_GH0.tar.gz) = 209681
-SHA256 (tarantool-luajit-8304ca9_GH0.tar.gz) = 91045d9c03874e0849a53b472b7439a3d291fc8f6b92ded496e3d786177a3799
-SIZE (tarantool-luajit-8304ca9_GH0.tar.gz) = 1298816
-SHA256 (tarantool-luarocks-954c2f5_GH0.tar.gz) = d8008994db63c725c23c03366cf85cbd8394a75da9ae14602bcacbcedacaa37b
-SIZE (tarantool-luarocks-954c2f5_GH0.tar.gz) = 5353746
-SHA256 (tarantool-small-781fd38_GH0.tar.gz) = a40f73f4f7256a7d1633bdfd641d561d1483739d3ef443236615db029b5507ed
-SIZE (tarantool-small-781fd38_GH0.tar.gz) = 125385
-SHA256 (tarantool-test-run-d16cbdc_GH0.tar.gz) = dec35011c6c049cdbcf968ed8e74fec7b2981d2d65116fbc0706f9158818792b
-SIZE (tarantool-test-run-d16cbdc_GH0.tar.gz) = 92896
+TIMESTAMP = 1653072329
+SHA256 (tarantool-2.10.0.tar.gz) = 42bb5a714ddf788a89ba4b2062582aee16a2bc7b68c7c3b8c03d7a30be878e2b
+SIZE (tarantool-2.10.0.tar.gz) = 45203838
diff --git a/databases/tarantool/files/patch-cmake-BuildLibUnwind.cmake b/databases/tarantool/files/patch-cmake-BuildLibUnwind.cmake
new file mode 100644
index 000000000000..f7394d98e4cb
--- /dev/null
+++ b/databases/tarantool/files/patch-cmake-BuildLibUnwind.cmake
@@ -0,0 +1,29 @@
+--- 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")
diff --git a/databases/tarantool/files/patch-cmake-BuildMisc.cmake b/databases/tarantool/files/patch-cmake-BuildMisc.cmake
deleted file mode 100644
index f803a79802fa..000000000000
--- a/databases/tarantool/files/patch-cmake-BuildMisc.cmake
+++ /dev/null
@@ -1,17 +0,0 @@
---- cmake/BuildMisc.cmake.orig 2020-07-17 11:22:52 UTC
-+++ cmake/BuildMisc.cmake
-@@ -35,11 +35,11 @@ macro(libmisc_build)
-
- if (HAVE_OPENMP)
- if(BUILD_STATIC)
-- set(GOMP_LIBRARY libgomp.a)
-+ set(OMP_LIBRARY libomp.a)
- else()
-- set(GOMP_LIBRARY gomp)
-+ set(OMP_LIBRARY omp)
- endif()
-- target_link_libraries(misc ${GOMP_LIBRARY} pthread ${CMAKE_DL_LIBS})
-+ target_link_libraries(misc ${OMP_LIBRARY} pthread ${CMAKE_DL_LIBS})
- endif()
-
- unset(misc_src)
diff --git a/databases/tarantool/files/patch-cmake-FindICONV.cmake b/databases/tarantool/files/patch-cmake-FindICONV.cmake
deleted file mode 100644
index b4e92d86f3e4..000000000000
--- a/databases/tarantool/files/patch-cmake-FindICONV.cmake
+++ /dev/null
@@ -1,11 +0,0 @@
---- cmake/FindICONV.cmake.orig 2018-10-12 19:53:35 UTC
-+++ cmake/FindICONV.cmake
-@@ -4,7 +4,7 @@
- # ICONV_LIBRARIES
- #
-
--if (TARGET_OS_LINUX)
-+if (TARGET_OS_FREEBSD OR TARGET_OS_LINUX)
- set(ICONV_LIBRARY "")
- else()
- find_library(ICONV_LIBRARY iconv)
diff --git a/databases/tarantool/files/patch-src-lib-tzcode-CMakeLists.txt b/databases/tarantool/files/patch-src-lib-tzcode-CMakeLists.txt
new file mode 100644
index 000000000000..3294e0bbcc6f
--- /dev/null
+++ b/databases/tarantool/files/patch-src-lib-tzcode-CMakeLists.txt
@@ -0,0 +1,60 @@
+--- 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/databases/tarantool/files/patch-test-unit-CMakeLists.txt b/databases/tarantool/files/patch-test-unit-CMakeLists.txt
new file mode 100644
index 000000000000..79d3653cab85
--- /dev/null
+++ b/databases/tarantool/files/patch-test-unit-CMakeLists.txt
@@ -0,0 +1,14 @@
+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)