From owner-dev-commits-ports-main@freebsd.org Wed Jun 16 02:40:19 2021 Return-Path: Delivered-To: dev-commits-ports-main@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 EA237659499; Wed, 16 Jun 2021 02:40:19 +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 4G4Ttq4lzhz4Vnq; Wed, 16 Jun 2021 02:40:19 +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 81DEA13BEF; Wed, 16 Jun 2021 02:40:19 +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 15G2eJYE006760; Wed, 16 Jun 2021 02:40:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 15G2eJJp006754; Wed, 16 Jun 2021 02:40:19 GMT (envelope-from git) Date: Wed, 16 Jun 2021 02:40:19 GMT Message-Id: <202106160240.15G2eJJp006754@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: 57c666779230 - main - archivers/snappy: Enable RTTI info MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 57c66677923080197589551026e400442848491c Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the main branch of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Jun 2021 02:40:20 -0000 The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=57c66677923080197589551026e400442848491c commit 57c66677923080197589551026e400442848491c Author: Yuri Victorovich AuthorDate: 2021-06-16 02:36:53 +0000 Commit: Yuri Victorovich CommitDate: 2021-06-16 02:40:17 +0000 archivers/snappy: Enable RTTI info devel/folly is (silently) built with unresolved symbols because snappy disables RTTI info. This later causes www/proxygen build failure. PR: 256625 Approved by: vanilla (maintainer) --- archivers/snappy/Makefile | 1 + archivers/snappy/files/patch-CMakeLists.txt | 19 ++++++++++++++++--- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/archivers/snappy/Makefile b/archivers/snappy/Makefile index b9745ba629b0..983fe03ad491 100644 --- a/archivers/snappy/Makefile +++ b/archivers/snappy/Makefile @@ -2,6 +2,7 @@ PORTNAME= snappy PORTVERSION= 1.1.9 +PORTREVISION= 1 CATEGORIES= archivers MAINTAINER= vanilla@FreeBSD.org diff --git a/archivers/snappy/files/patch-CMakeLists.txt b/archivers/snappy/files/patch-CMakeLists.txt index cc912901362c..306df294b015 100644 --- a/archivers/snappy/files/patch-CMakeLists.txt +++ b/archivers/snappy/files/patch-CMakeLists.txt @@ -1,6 +1,19 @@ --- CMakeLists.txt.orig 2021-05-04 22:53:34 UTC +++ CMakeLists.txt -@@ -213,8 +213,7 @@ configure_file( +@@ -78,8 +78,10 @@ else(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-exceptions") + + # Disable RTTI. +- string(REGEX REPLACE "-frtti" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-rtti") ++ 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}") ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-rtti") ++ endif() + endif(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") + + # BUILD_SHARED_LIBS is a standard CMake variable, but we declare it here to make +@@ -213,8 +215,7 @@ configure_file( "snappy-stubs-public.h.in" "${PROJECT_BINARY_DIR}/snappy-stubs-public.h") @@ -10,7 +23,7 @@ PRIVATE "snappy-internal.h" "snappy-stubs-internal.h" -@@ -235,20 +234,35 @@ target_sources(snappy +@@ -235,20 +236,35 @@ target_sources(snappy $ $ ) @@ -50,7 +63,7 @@ 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) +@@ -359,7 +375,7 @@ endif(SNAPPY_FUZZING_BUILD) include(GNUInstallDirs) if(SNAPPY_INSTALL)