From owner-dev-commits-ports-all@freebsd.org Thu May 6 15:06:14 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 886CD62491D; Thu, 6 May 2021 15:06:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FbcNQ3S5Rz4lpN; Thu, 6 May 2021 15:06:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 68D4F1A697; Thu, 6 May 2021 15:06:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 146F6Ebs082678; Thu, 6 May 2021 15:06:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 146F6EQ5082677; Thu, 6 May 2021 15:06:14 GMT (envelope-from git) Date: Thu, 6 May 2021 15:06:14 GMT Message-Id: <202105061506.146F6EQ5082677@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Vanilla I. Shu" Subject: git: 35c6c8453503 - main - archivers/snappy: update to 1.1.9, also build static library. MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vanilla X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 35c6c8453503fbf34fd34da30b81a3993d1c8f7d Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 06 May 2021 15:06:14 -0000 The branch main has been updated by vanilla: URL: https://cgit.FreeBSD.org/ports/commit/?id=35c6c8453503fbf34fd34da30b81a3993d1c8f7d commit 35c6c8453503fbf34fd34da30b81a3993d1c8f7d Author: Vanilla I. Shu AuthorDate: 2021-05-06 15:02:34 +0000 Commit: Vanilla I. Shu CommitDate: 2021-05-06 15:05:57 +0000 archivers/snappy: update to 1.1.9, also build static library. PR: 246592 Reported by: Mitchell Holland --- archivers/snappy/Makefile | 4 +- archivers/snappy/distinfo | 6 +-- archivers/snappy/files/patch-CMakeLists.txt | 61 +++++++++++++++++++++++++++++ archivers/snappy/pkg-plist | 1 + 4 files changed, 67 insertions(+), 5 deletions(-) diff --git a/archivers/snappy/Makefile b/archivers/snappy/Makefile index 7a394217f9c0..b9745ba629b0 100644 --- a/archivers/snappy/Makefile +++ b/archivers/snappy/Makefile @@ -1,7 +1,7 @@ # Created by: Vanilla I. Shu PORTNAME= snappy -PORTVERSION= 1.1.8 +PORTVERSION= 1.1.9 CATEGORIES= archivers MAINTAINER= vanilla@FreeBSD.org @@ -12,7 +12,7 @@ LICENSE= BSD3CLAUSE USES= cmake compiler:c++11-lang USE_LDCONFIG= yes CMAKE_ON= BUILD_SHARED_LIBS -CMAKE_OFF= SNAPPY_BUILD_TESTS +CMAKE_OFF= SNAPPY_BUILD_TESTS SNAPPY_BUILD_BENCHMARKS CMAKE_BUILD_TYPE= Release USE_GITHUB= yes GH_ACCOUNT= google diff --git a/archivers/snappy/distinfo b/archivers/snappy/distinfo index 4e55626477d2..a07c71d53303 100644 --- a/archivers/snappy/distinfo +++ b/archivers/snappy/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1579651155 -SHA256 (google-snappy-1.1.8_GH0.tar.gz) = 16b677f07832a612b0836178db7f374e414f94657c138e6993cbfc5dcc58651f -SIZE (google-snappy-1.1.8_GH0.tar.gz) = 1096137 +TIMESTAMP = 1620309917 +SHA256 (google-snappy-1.1.9_GH0.tar.gz) = 75c1fbb3d618dd3a0483bff0e26d0a92b495bbe5059c8b4f1c962b478b6e06e7 +SIZE (google-snappy-1.1.9_GH0.tar.gz) = 1102382 diff --git a/archivers/snappy/files/patch-CMakeLists.txt b/archivers/snappy/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..cc912901362c --- /dev/null +++ b/archivers/snappy/files/patch-CMakeLists.txt @@ -0,0 +1,61 @@ +--- CMakeLists.txt.orig 2021-05-04 22:53:34 UTC ++++ CMakeLists.txt +@@ -213,8 +213,7 @@ configure_file( + "snappy-stubs-public.h.in" + "${PROJECT_BINARY_DIR}/snappy-stubs-public.h") + +-add_library(snappy "") +-target_sources(snappy ++set(SNAPPY_SRCS + PRIVATE + "snappy-internal.h" + "snappy-stubs-internal.h" +@@ -235,20 +234,35 @@ target_sources(snappy + $ + $ + ) +-target_include_directories(snappy ++set(SNAPPY_INCS + PUBLIC + $ + $ + $ + ) ++add_library(snappy SHARED) ++target_sources(snappy ${SNAPPY_SRCS}) ++target_include_directories(snappy ${SNAPPY_INCS}) + set_target_properties(snappy + PROPERTIES VERSION ${PROJECT_VERSION} SOVERSION ${PROJECT_VERSION_MAJOR}) + + target_compile_definitions(snappy PRIVATE -DHAVE_CONFIG_H) +-if(BUILD_SHARED_LIBS) +- set_target_properties(snappy PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS ON) +-endif(BUILD_SHARED_LIBS) ++set_target_properties(snappy PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS ON) + ++add_library(snappy-static STATIC) ++target_sources(snappy-static ${SNAPPY_SRCS}) ++target_include_directories(snappy-static ${SNAPPY_INCS}) ++set_target_properties(snappy-static ++ PROPERTIES VERSION ${PROJECT_VERSION} SOVERSION ${PROJECT_VERSION_MAJOR}) ++ ++target_compile_definitions(snappy-static PRIVATE -DHAVE_CONFIG_H) ++ ++if (MSVC) ++ set_target_properties(snappy-static PROPERTIES OUTPUT_NAME snappy-static) ++else() ++ set_target_properties(snappy-static PROPERTIES OUTPUT_NAME snappy) ++endif() ++ + if(SNAPPY_BUILD_TESTS OR SNAPPY_BUILD_BENCHMARKS) + add_library(snappy_test_support "") + target_sources(snappy_test_support +@@ -359,7 +373,7 @@ endif(SNAPPY_FUZZING_BUILD) + include(GNUInstallDirs) + + if(SNAPPY_INSTALL) +- install(TARGETS snappy ++ install(TARGETS snappy snappy-static + EXPORT SnappyTargets + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} diff --git a/archivers/snappy/pkg-plist b/archivers/snappy/pkg-plist index a1b4504c6031..8eca7d24cf00 100644 --- a/archivers/snappy/pkg-plist +++ b/archivers/snappy/pkg-plist @@ -6,6 +6,7 @@ lib/cmake/Snappy/SnappyConfig.cmake lib/cmake/Snappy/SnappyConfigVersion.cmake lib/cmake/Snappy/SnappyTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Snappy/SnappyTargets.cmake +lib/libsnappy.a lib/libsnappy.so lib/libsnappy.so.1 lib/libsnappy.so.%%PORTVERSION%%