mykola/freebsd-ports
1
0
Fork 0
forked from Lainports/freebsd-ports
Code Pull requests Activity

archivers/snappy: update to 1.2.1

Browse source
This commit is contained in:
Vanilla I. Shu 2024-06-06 11:03:23 +08:00
parent 33c9c139ac
commit f24377b7b9
3 changed files with 19 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
archivers/snappy/Makefile
View file

@ -1,5 +1,5 @@
PORTNAME= snappy PORTNAME= snappy
DISTVERSION= 1.2.0 DISTVERSION= 1.2.1
CATEGORIES= archivers CATEGORIES= archivers
MAINTAINER= vanilla@FreeBSD.org MAINTAINER= vanilla@FreeBSD.org

6
archivers/snappy/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1712399939 TIMESTAMP = 1717485290
SHA256 (google-snappy-1.2.0_GH0.tar.gz) = 9b8f10fbb5e3bc112f2e5e64f813cb73faea42ec9c533a5023b5ae08aedef42e SHA256 (google-snappy-1.2.1_GH0.tar.gz) = 736aeb64d86566d2236ddffa2865ee5d7a82d26c9016b36218fcc27ea4f09f86
SIZE (google-snappy-1.2.0_GH0.tar.gz) = 1107265 SIZE (google-snappy-1.2.1_GH0.tar.gz) = 1108761

40
archivers/snappy/files/patch-CMakeLists.txt
View file

@ -1,27 +1,18 @@
--- CMakeLists.txt.orig 2024-04-04 19:04:38 UTC --- CMakeLists.txt.orig 2024-05-21 19:36:39 UTC
+++ CMakeLists.txt +++ CMakeLists.txt
@@ -27,7 +27,7 @@ cmake_minimum_required(VERSION 3.1) @@ -53,8 +53,10 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. add_definitions(-D_HAS_EXCEPTIONS=0)
cmake_minimum_required(VERSION 3.1)
-project(Snappy VERSION 1.1.10 LANGUAGES C CXX)
+project(Snappy VERSION 1.2.0 LANGUAGES C CXX)
# C++ standard can be overridden when this is used as a sub-project.
if(NOT CMAKE_CXX_STANDARD)
@@ -83,8 +83,10 @@ else(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-exceptions")
# Disable RTTI. # Disable RTTI.
- string(REGEX REPLACE "-frtti" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") - string(REGEX REPLACE "/GR" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-rtti") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /GR-")
+ if (NOT CMAKE_SYSTEM_NAME MATCHES "FreeBSD") # devel/folly requires RTTI info, see https://github.com/facebook/folly/issues/1606 + if (NOT CMAKE_SYSTEM_NAME MATCHES "FreeBSD") # devel/folly requires RTTI info, see https://github.com/facebook/folly/issues/1606
+ string(REGEX REPLACE "-frtti" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") + string(REGEX REPLACE "/GR" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-rtti") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /GR-")
+ endif() + endif()
endif(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") else(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
# Use -Wall for clang and gcc.
# BUILD_SHARED_LIBS is a standard CMake variable, but we declare it here to make if(NOT CMAKE_CXX_FLAGS MATCHES "-Wall")
@@ -248,8 +250,7 @@ configure_file( @@ -248,8 +250,7 @@ configure_file(
"snappy-stubs-public.h.in" "snappy-stubs-public.h.in"
"${PROJECT_BINARY_DIR}/snappy-stubs-public.h") "${PROJECT_BINARY_DIR}/snappy-stubs-public.h")
@ -32,7 +23,7 @@
PRIVATE PRIVATE
"snappy-internal.h" "snappy-internal.h"
"snappy-stubs-internal.h" "snappy-stubs-internal.h"
@@ -270,20 +271,35 @@ target_sources(snappy @@ -270,20 +271,34 @@ target_sources(snappy
$<BUILD_INTERFACE:${PROJECT_BINARY_DIR}/snappy-stubs-public.h> $<BUILD_INTERFACE:${PROJECT_BINARY_DIR}/snappy-stubs-public.h>
$<INSTALL_INTERFACE:include/snappy-stubs-public.h> $<INSTALL_INTERFACE:include/snappy-stubs-public.h>
) )
@ -54,25 +45,24 @@
- set_target_properties(snappy PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS ON) - set_target_properties(snappy PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS ON)
-endif(BUILD_SHARED_LIBS) -endif(BUILD_SHARED_LIBS)
+set_target_properties(snappy PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS ON) +set_target_properties(snappy PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS ON)
+add_library(snappy-static STATIC) +add_library(snappy-static STATIC)
+target_sources(snappy-static ${SNAPPY_SRCS}) +target_sources(snappy-static ${SNAPPY_SRCS})
+target_include_directories(snappy-static ${SNAPPY_INCS}) +target_include_directories(snappy-static ${SNAPPY_INCS})
+set_target_properties(snappy-static +set_target_properties(snappy-static
+ PROPERTIES VERSION ${PROJECT_VERSION} SOVERSION ${PROJECT_VERSION_MAJOR}) + PROPERTIES VERSION ${PROJECT_VERSION} SOVERSION ${PROJECT_VERSION_MAJOR})
+
+target_compile_definitions(snappy-static PRIVATE -DHAVE_CONFIG_H) +target_compile_definitions(snappy-static PRIVATE -DHAVE_CONFIG_H)
+ +
+if (MSVC) +if (MSVC)
+ set_target_properties(snappy-static PROPERTIES OUTPUT_NAME snappy-static) + set_target_properties(snappy-static PROPERTIES OUTPUT_NAME snappy-static)
+else() +else()
+ set_target_properties(snappy-static PROPERTIES OUTPUT_NAME snappy) + set_target_properties(snappy-static PROPERTIES OUTPUT_NAME snappy)
+endif() +endif()
+ +
if(SNAPPY_BUILD_TESTS OR SNAPPY_BUILD_BENCHMARKS) if(SNAPPY_BUILD_TESTS OR SNAPPY_BUILD_BENCHMARKS)
add_library(snappy_test_support "") add_library(snappy_test_support "")
target_sources(snappy_test_support target_sources(snappy_test_support
@@ -399,7 +415,7 @@ if(SNAPPY_INSTALL) @@ -399,7 +414,7 @@ if(SNAPPY_INSTALL)
include(GNUInstallDirs) include(GNUInstallDirs)
if(SNAPPY_INSTALL) if(SNAPPY_INSTALL)