From nobody Tue Jul 09 02:23:50 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WJ4YL5NWrz5MjyK; Tue, 09 Jul 2024 02:23:50 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WJ4YL4pG9z4FxQ; Tue, 9 Jul 2024 02:23:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1720491830; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rxjQYwEbStHhFK/Tz8+ecHjwk5gS7UaOcHUgE7IpHNk=; b=Ft8OzKd++HcMNFIjKCeKqbcBcAQBYJA+qEPoMqkzSfj0QhlkOFY7BLjuNQXgoij2S7Rnjw N7ZPkjB6/pIFVQp2em8a/Ie0lKIXwAEfCE57qfu/eZ5Ft6r+1T+x1w6xIEEwBFfib/aPS8 lqR9n/1+chgQCjjQmCLC2z5orphboWeXUzaOhi04y9EQni/b9rHdrSnz3gY9gXZ8dXEH8H lm1YIcLrsg0fqrU33ZK5y3Rucs+BeYxPmkOrP2bTB0HvTTfR+6BxfDkzFglULGbAlnVZmv 0A52NpwDjqMa2kQdiR+JBmdAgu3boh2d6u80m1PfFvh4rKkLlW5t+x+J5wIs5Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1720491830; a=rsa-sha256; cv=none; b=izKm7/5mmGLvtKRTc7x2/UgzTyq6wIustWBIATZ3RzJribnRs9PgcpTrKhvBrYVPpjJCIG PCoilBFft8iGheKq3lVjXB9lxye5RmMWaEUzh7rfc399l4bgBFQffWdyqYQIDNr5iTNC42 ggViinBvlsYYfhFBZCYNgNi5CDUp0rQiYsgDG4Vt6YskfXZKN/5rO7v6UhwEx3XT6UGxqm uCWcb0irhyLrx1QI3+s1vromDBwRmVI1y0u2pFvAO9FHbiPzldfPukfTXnfVpJX7rWOriM 5y/PqYK0bsAhm1YhMbJFT4sVdDjo6yANhvPXB8EdjP7xk6ZFA5ALQbwrrbj3Rw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1720491830; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rxjQYwEbStHhFK/Tz8+ecHjwk5gS7UaOcHUgE7IpHNk=; b=pIevjcKca66AL0ou12WQuDemXpqpS2gUuKU7uXK5yBv/xiDXowkjgv9OEHHZuBnma3z7ON N87ZyCwM2tvCTucjKghf1Jzc+FPB3U1oCOzeJSc+bsXsb3O5/TzCOFv/z3EGjfA7APxAV2 InqPHDTDVV9P8ieq6tB6nXLw3b6MkACG9LevwK3rvghKfuTEPgV+qTLbdQRBLr9XLR6Hx3 cGSvalXJ6BsCrhTDykYVOllQbDT+Znrha81FC3Ds83MuSmtDa7msIyHo/Z7T+YHPfNRCyK qqDryrAqLQOhm7GTwFk4CHtZDgYmJoWljPQBP+RoeN0bVEzjlcyBhPmZjIjNUg== 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 4WJ4YL4Q9xzGQq; Tue, 9 Jul 2024 02:23:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4692NoPH021454; Tue, 9 Jul 2024 02:23:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4692NoqY021451; Tue, 9 Jul 2024 02:23:50 GMT (envelope-from git) Date: Tue, 9 Jul 2024 02:23:50 GMT Message-Id: <202407090223.4692NoqY021451@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: 4998b87533cc - main - archivers/snappy: Enable RTTI List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org 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: 4998b87533cc000fa9cce7c64e1a499f19efd29a Auto-Submitted: auto-generated The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=4998b87533cc000fa9cce7c64e1a499f19efd29a commit 4998b87533cc000fa9cce7c64e1a499f19efd29a Author: Yuri Victorovich AuthorDate: 2024-07-09 02:16:37 +0000 Commit: Yuri Victorovich CommitDate: 2024-07-09 02:23:44 +0000 archivers/snappy: Enable RTTI This fixes the build problem at least in www/proxygen when it expects typeinfo of some Snappy class that is missing w/out the RTTI info. PR: 279969 Approved by: vanilla@FreeBSD.org (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 4f722de84b77..32e11fb58fbf 100644 --- a/archivers/snappy/Makefile +++ b/archivers/snappy/Makefile @@ -1,5 +1,6 @@ PORTNAME= snappy DISTVERSION= 1.2.1 +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 be8f6d0055d1..52c04875092f 100644 --- a/archivers/snappy/files/patch-CMakeLists.txt +++ b/archivers/snappy/files/patch-CMakeLists.txt @@ -13,7 +13,20 @@ else(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") # Use -Wall for clang and gcc. if(NOT CMAKE_CXX_FLAGS MATCHES "-Wall") -@@ -248,8 +250,7 @@ configure_file( +@@ -83,8 +85,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") ++ 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 +@@ -248,8 +252,7 @@ configure_file( "snappy-stubs-public.h.in" "${PROJECT_BINARY_DIR}/snappy-stubs-public.h") @@ -23,7 +36,7 @@ PRIVATE "snappy-internal.h" "snappy-stubs-internal.h" -@@ -270,20 +271,34 @@ target_sources(snappy +@@ -270,20 +273,34 @@ target_sources(snappy $ $ ) @@ -62,7 +75,7 @@ if(SNAPPY_BUILD_TESTS OR SNAPPY_BUILD_BENCHMARKS) add_library(snappy_test_support "") target_sources(snappy_test_support -@@ -399,7 +414,7 @@ if(SNAPPY_INSTALL) +@@ -399,7 +416,7 @@ if(SNAPPY_INSTALL) include(GNUInstallDirs) if(SNAPPY_INSTALL)