Update to newer snapshot

Changes:	https://github.com/tarantool/tarantool-c/commits/master
This commit is contained in:
Sunpoet Po-Chuan Hsieh 2019-04-07 20:05:40 +00:00
parent 74b4b94bc2
commit 95e1975619
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=498310
4 changed files with 8 additions and 31 deletions

View file

@ -2,6 +2,7 @@
PORTNAME= tarantool-c PORTNAME= tarantool-c
PORTVERSION= 1.0.1 PORTVERSION= 1.0.1
PORTREVISION= 1
CATEGORIES= databases CATEGORIES= databases
MAINTAINER= sunpoet@FreeBSD.org MAINTAINER= sunpoet@FreeBSD.org
@ -11,12 +12,13 @@ LICENSE= BSD2CLAUSE
LIB_DEPENDS= libmsgpuck.so:devel/msgpuck LIB_DEPENDS= libmsgpuck.so:devel/msgpuck
CMAKE_OFF= ENABLE_BUNDLED_MSGPUCK
USES= cmake USES= cmake
CMAKE_OFF= ENABLE_BUNDLED_DOCS ENABLE_BUNDLED_MSGPUCK
USE_GITHUB= yes USE_GITHUB= yes
GH_ACCOUNT= tarantool GH_ACCOUNT= tarantool
GH_TAGNAME= 7bb49a1 GH_TAGNAME= d93096a
post-patch: post-patch:
@${GREP} -lr 'msgpuck/msgpuck.h' ${WRKSRC}/ | ${XARGS} ${REINPLACE_CMD} -e 's|msgpuck/msgpuck.h|msgpuck.h|' @${GREP} -lr 'msgpuck/msgpuck.h' ${WRKSRC}/ | ${XARGS} ${REINPLACE_CMD} -e 's|msgpuck/msgpuck.h|msgpuck.h|'

View file

@ -1,3 +1,3 @@
TIMESTAMP = 1519680640 TIMESTAMP = 1554563575
SHA256 (tarantool-tarantool-c-1.0.1-7bb49a1_GH0.tar.gz) = 03250ab8bf2e8135e075953cef18ee5323061539056e2fff995cf34b33ea7ed2 SHA256 (tarantool-tarantool-c-1.0.1-d93096a_GH0.tar.gz) = cb0e3794535b7e7e5871f243a53c8d0086cf0256f041f0e8f34493f67ddea74c
SIZE (tarantool-tarantool-c-1.0.1-7bb49a1_GH0.tar.gz) = 137960 SIZE (tarantool-tarantool-c-1.0.1-d93096a_GH0.tar.gz) = 140415

View file

@ -1,26 +0,0 @@
--- tnt/CMakeLists.txt.orig 2016-09-07 09:59:59 UTC
+++ tnt/CMakeLists.txt
@@ -42,7 +42,6 @@ set (TNT_SOURCES
${CMAKE_SOURCE_DIR}/third_party/sha1.c
${CMAKE_SOURCE_DIR}/third_party/base64.c
${CMAKE_SOURCE_DIR}/third_party/PMurHash.c
- ${CMAKE_SOURCE_DIR}/third_party/msgpuck.c
)
#----------------------------------------------------------------------------#
@@ -52,6 +51,7 @@ set (TNT_SOURCES
## Static library
project(tnt)
add_library(${PROJECT_NAME} STATIC ${TNT_SOURCES})
+target_link_libraries(${PROJECT_NAME} ${MSGPUCK_LIBRARIES})
set_target_properties(${PROJECT_NAME} PROPERTIES VERSION ${LIBTNT_VERSION})
set_target_properties(${PROJECT_NAME} PROPERTIES SOVERSION ${LIBTNT_SOVERSION})
set_target_properties(${PROJECT_NAME} PROPERTIES OUTPUT_NAME "tarantool")
@@ -65,6 +65,7 @@ install (TARGETS ${PROJECT_NAME}
## Shared library
project(tnt_shared)
add_library(${PROJECT_NAME} SHARED ${TNT_SOURCES})
+target_link_libraries(${PROJECT_NAME} ${MSGPUCK_LIBRARIES})
set_target_properties(${PROJECT_NAME} PROPERTIES VERSION ${LIBTNT_VERSION})
set_target_properties(${PROJECT_NAME} PROPERTIES SOVERSION ${LIBTNT_SOVERSION})
set_target_properties(${PROJECT_NAME} PROPERTIES OUTPUT_NAME "tarantool")

View file

@ -3,6 +3,7 @@ include/tarantool/tnt_auth.h
include/tarantool/tnt_buf.h include/tarantool/tnt_buf.h
include/tarantool/tnt_call.h include/tarantool/tnt_call.h
include/tarantool/tnt_delete.h include/tarantool/tnt_delete.h
include/tarantool/tnt_execute.h
include/tarantool/tnt_insert.h include/tarantool/tnt_insert.h
include/tarantool/tnt_io.h include/tarantool/tnt_io.h
include/tarantool/tnt_iob.h include/tarantool/tnt_iob.h