From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 6788C158086 for ; Wed, 17 Nov 2021 07:48:20 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B28BDE081B; Wed, 17 Nov 2021 07:48:19 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7A26EE081B for ; Wed, 17 Nov 2021 07:48:19 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id F1FE0342E41 for ; Wed, 17 Nov 2021 07:48:15 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 73DE71BA for ; Wed, 17 Nov 2021 07:48:14 +0000 (UTC) From: "Joonas Niilola" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Joonas Niilola" Message-ID: <1637135287.a34edd22137c9c34670aecd60ed75bbe65393c4a.juippis@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-arch/snappy/files/, app-arch/snappy/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-arch/snappy/files/snappy-1.1.9_remove-no-rtti.patch app-arch/snappy/snappy-1.1.9-r1.ebuild X-VCS-Directories: app-arch/snappy/files/ app-arch/snappy/ X-VCS-Committer: juippis X-VCS-Committer-Name: Joonas Niilola X-VCS-Revision: a34edd22137c9c34670aecd60ed75bbe65393c4a X-VCS-Branch: master Date: Wed, 17 Nov 2021 07:48:14 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: dc2fe964-b496-4bc1-86d9-debed44a4133 X-Archives-Hash: 9eb54b655f53cc42b7bcaaf2c09d9f6d commit: a34edd22137c9c34670aecd60ed75bbe65393c4a Author: Azamat H. Hackimov gmail com> AuthorDate: Sun Oct 24 17:07:44 2021 +0000 Commit: Joonas Niilola gentoo org> CommitDate: Wed Nov 17 07:48:07 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a34edd22 app-arch/snappy: remove -fno-rtti option Remove -fno-rtti option which may broke compilation of dependant packages. Migrate to EAPI=8, minor cleanups. Closes: https://bugs.gentoo.org/819909 Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Azamat H. Hackimov gmail.com> Closes: https://github.com/gentoo/gentoo/pull/22699 Signed-off-by: Joonas Niilola gentoo.org> .../snappy/files/snappy-1.1.9_remove-no-rtti.patch | 35 +++++++++++++++++ app-arch/snappy/snappy-1.1.9-r1.ebuild | 45 ++++++++++++++++++++++ 2 files changed, 80 insertions(+) diff --git a/app-arch/snappy/files/snappy-1.1.9_remove-no-rtti.patch b/app-arch/snappy/files/snappy-1.1.9_remove-no-rtti.patch new file mode 100644 index 000000000000..16528b59457c --- /dev/null +++ b/app-arch/snappy/files/snappy-1.1.9_remove-no-rtti.patch @@ -0,0 +1,35 @@ +From 516fdcca6606502e2d562d20c01b225c8d066739 Mon Sep 17 00:00:00 2001 +From: holmes1412 +Date: Fri, 28 May 2021 21:46:53 +0800 +Subject: [PATCH] remove Disable-RTTI flags for the convenient of derivation + +--- + CMakeLists.txt | 8 -------- + 1 file changed, 8 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 672561e..31afaa0 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -51,10 +51,6 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") + string(REGEX REPLACE "/EH[a-z]+" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /EHs-c-") + add_definitions(-D_HAS_EXCEPTIONS=0) +- +- # Disable RTTI. +- string(REGEX REPLACE "/GR" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /GR-") + else(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") + # Use -Wall for clang and gcc. + if(NOT CMAKE_CXX_FLAGS MATCHES "-Wall") +@@ -76,10 +72,6 @@ else(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") + # Disable C++ exceptions. + string(REGEX REPLACE "-fexceptions" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") + 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") + endif(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") + + # BUILD_SHARED_LIBS is a standard CMake variable, but we declare it here to make diff --git a/app-arch/snappy/snappy-1.1.9-r1.ebuild b/app-arch/snappy/snappy-1.1.9-r1.ebuild new file mode 100644 index 000000000000..74b9e884e633 --- /dev/null +++ b/app-arch/snappy/snappy-1.1.9-r1.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake-multilib + +DESCRIPTION="A high-speed compression/decompression library by Google" +HOMEPAGE="https://github.com/google/snappy" +SRC_URI="https://github.com/google/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD" +SLOT="0/${PV%%.*}" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos" +IUSE="test" +RESTRICT="!test? ( test )" + +DEPEND="test? ( dev-cpp/gtest )" + +DOCS=( format_description.txt framing_format.txt NEWS README.md ) + +PATCHES=( + "${FILESDIR}/${P}_gcc_inline.patch" + "${FILESDIR}/${P}_external_gtest.patch" + "${FILESDIR}/${P}-clang-werror.patch" + "${FILESDIR}/${P}_remove-no-rtti.patch" +) + +multilib_src_configure() { + local mycmakeargs=( + -DSNAPPY_BUILD_TESTS=$(usex test) + -DSNAPPY_BUILD_BENCHMARKS=OFF + # Options below are related to benchmarking, that we disable. + -DHAVE_LIBZ=NO + -DHAVE_LIBLZO2=NO + -DHAVE_LIBLZ4=NO + ) + cmake_src_configure +} + +multilib_src_test() { + # run tests directly to get verbose output + cd "${S}" || die + "${BUILD_DIR}"/snappy_unittest || die +}