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 5078B15800A for ; Wed, 16 Aug 2023 13:08:21 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 410FC2BC017; Wed, 16 Aug 2023 13:08:20 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 2DF032BC017 for ; Wed, 16 Aug 2023 13:08:20 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 38545340D6B for ; Wed, 16 Aug 2023 13:08:19 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7E721F4E for ; Wed, 16 Aug 2023 13:08:17 +0000 (UTC) From: "Denis Reva" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Denis Reva" Message-ID: <1692191286.78fe745fe3ab6c066cf33e79205dde1a71e2384b.RarogCmex@gentoo> Subject: [gentoo-commits] repo/proj/guru:dev commit in: sys-fs/dwarfs/ X-VCS-Repository: repo/proj/guru X-VCS-Files: sys-fs/dwarfs/dwarfs-0.7.2-r1.ebuild sys-fs/dwarfs/dwarfs-0.7.2.ebuild X-VCS-Directories: sys-fs/dwarfs/ X-VCS-Committer: RarogCmex X-VCS-Committer-Name: Denis Reva X-VCS-Revision: 78fe745fe3ab6c066cf33e79205dde1a71e2384b X-VCS-Branch: dev Date: Wed, 16 Aug 2023 13:08:17 +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: a1231b18-d4ec-496d-bac4-3eeb767c57d7 X-Archives-Hash: 9e577fc1a555cb43296ae62eec3ca225 commit: 78fe745fe3ab6c066cf33e79205dde1a71e2384b Author: Denis Reva gmail com> AuthorDate: Wed Aug 16 13:08:06 2023 +0000 Commit: Denis Reva gmail com> CommitDate: Wed Aug 16 13:08:06 2023 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=78fe745f sys-fs/dwarfs: fixed issues with soname libs Closes: https://bugs.gentoo.org/910719 Closes: https://bugs.gentoo.org/900014 Signed-off-by: Denis Reva gmail.com> ...{dwarfs-0.7.2.ebuild => dwarfs-0.7.2-r1.ebuild} | 30 ++++++++++++++++------ 1 file changed, 22 insertions(+), 8 deletions(-) diff --git a/sys-fs/dwarfs/dwarfs-0.7.2.ebuild b/sys-fs/dwarfs/dwarfs-0.7.2-r1.ebuild similarity index 74% rename from sys-fs/dwarfs/dwarfs-0.7.2.ebuild rename to sys-fs/dwarfs/dwarfs-0.7.2-r1.ebuild index 8809b087c1..983d49b3c8 100644 --- a/sys-fs/dwarfs/dwarfs-0.7.2.ebuild +++ b/sys-fs/dwarfs/dwarfs-0.7.2-r1.ebuild @@ -9,7 +9,7 @@ inherit check-reqs cmake flag-o-matic python-single-r1 DESCRIPTION="A fast very high compression read-only FUSE file system" HOMEPAGE="https://github.com/mhx/dwarfs" -SRC_URI="https://github.com/mhx/dwarfs/releases/download/v${PV}/${PN}-${PV}.tar.xz" +SRC_URI="https://github.com/mhx/dwarfs/releases/download/v${PV}/${P}.tar.xz" LICENSE="GPL-3" SLOT="0" @@ -64,7 +64,14 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" CHECKREQS_DISK_BUILD="1300M" CMAKE_IN_SOURCE_BUILD=1 CMAKE_WARN_UNUSED_CLI=0 - +#These files supposed to have no symlink +QA_SONAME=( +"/usr/sbin/dwarfs" +"/usr/bin/dwarfsbench" +"/usr/bin/dwarfsck" +"/usr/bin/dwarfsextract" +"/usr/bin/mkdwarfs" +) src_prepare(){ rm -r zstd xxHash parallel-hashmap || die cmake_src_prepare @@ -88,15 +95,22 @@ src_configure(){ use python && mycmakeargs+=( "-DWITH_PYTHON_VERSION=${EPYTHON#python}" ) cmake_src_configure } - -src_install(){ - cmake_src_install +src_compile(){ + cmake_src_compile # Remove insecure RPATH from bundled lib patchelf --remove-rpath libdwarfs.so || die patchelf --remove-rpath libdwarfs_tool.so || die - - dolib.so libdwarfs.so libdwarfs_tool.so libdwarfs_compression.so libthrift_light.so libmetadata_thrift.so - dolib.so folly/libfolly.so folly/libfolly.so.0.58.0-dev + patchelf --remove-rpath libmetadata_thrift.so || die + patchelf --remove-rpath libdwarfs_compression.so || die + patchelf --remove-rpath libthrift_light.so || die + patchelf --remove-rpath libdwarfs_main.so || die + # TODO: make it proper +} +src_install(){ + # Perform install + cmake_src_install + dolib.so libdwarfs.so libdwarfs_main.so libdwarfs_tool.so libdwarfs_compression.so libthrift_light.so libmetadata_thrift.so || die "Install failed" + dolib.so folly/libfolly.so folly/libfolly.so.0.58.0-dev libmkdwarfs_main.so libdwarfsbench_main.so libdwarfsck_main.so libdwarfsextract_main.so || die "Install failed" } pkg_postinst(){