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 4000E158451 for ; Wed, 10 Jan 2024 06:31:26 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6FB8EE29BC; Wed, 10 Jan 2024 06:31:25 +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) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 52CC8E29BC for ; Wed, 10 Jan 2024 06:31:25 +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 49D6834325B for ; Wed, 10 Jan 2024 06:31:24 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9D5DA12C8 for ; Wed, 10 Jan 2024 06:31:22 +0000 (UTC) From: "YiFei Zhu" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "YiFei Zhu" Message-ID: <1704868238.d52ad47abfb734fb3bb6abc050a1d1fe92ce8a9f.zhuyifei1999@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.4-r2.ebuild sys-fs/dwarfs/dwarfs-0.7.4-r3.ebuild X-VCS-Directories: sys-fs/dwarfs/ X-VCS-Committer: zhuyifei1999 X-VCS-Committer-Name: YiFei Zhu X-VCS-Revision: d52ad47abfb734fb3bb6abc050a1d1fe92ce8a9f X-VCS-Branch: dev Date: Wed, 10 Jan 2024 06:31:22 +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: da8b341b-bb94-4b29-9eae-e2b0cc09e5c4 X-Archives-Hash: 142cb8e8ee54fb9b52ba1bb409ceb88a commit: d52ad47abfb734fb3bb6abc050a1d1fe92ce8a9f Author: YiFei Zhu gmail com> AuthorDate: Wed Jan 10 06:28:43 2024 +0000 Commit: YiFei Zhu gmail com> CommitDate: Wed Jan 10 06:30:38 2024 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=d52ad47a sys-fs/dwarfs: Actually remove RPATH Still can't figure out how to let cmake do it for us, but I guess it is how it is for now. Closes: https://bugs.gentoo.org/910323 Signed-off-by: YiFei Zhu gmail.com> ...arfs-0.7.4-r2.ebuild => dwarfs-0.7.4-r3.ebuild} | 37 ++++++++++++++-------- 1 file changed, 24 insertions(+), 13 deletions(-) diff --git a/sys-fs/dwarfs/dwarfs-0.7.4-r2.ebuild b/sys-fs/dwarfs/dwarfs-0.7.4-r3.ebuild similarity index 83% rename from sys-fs/dwarfs/dwarfs-0.7.4-r2.ebuild rename to sys-fs/dwarfs/dwarfs-0.7.4-r3.ebuild index 31cb64bd3e..5bcbf93151 100644 --- a/sys-fs/dwarfs/dwarfs-0.7.4-r2.ebuild +++ b/sys-fs/dwarfs/dwarfs-0.7.4-r3.ebuild @@ -47,6 +47,7 @@ RDEPEND=" DEPEND="${RDEPEND}" BDEPEND=" + dev-util/patchelf sys-devel/bison sys-devel/flex virtual/pkgconfig @@ -62,15 +63,6 @@ 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 sed "s/DESTINATION lib/DESTINATION $(get_libdir)/" -i CMakeLists.txt || die @@ -105,11 +97,30 @@ src_configure() { } src_install() { - # Perform install + local libs=( + libdwarfs.so + libdwarfs_main.so + libdwarfs_tool.so + libdwarfs_compression.so + libthrift_light.so + libmetadata_thrift.so + libmkdwarfs_main.so + libdwarfsbench_main.so + libdwarfsck_main.so + libdwarfsextract_main.so + libdwarfsck_main.so + libdwarfsextract_main.so + folly/libfolly.so + folly/libfolly.so.0.58.0-dev + ) + 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 || die "Install failed" - dolib.so libdwarfsck_main.so libdwarfsextract_main.so || die "Install failed" + + for lib in "${libs[@]}"; do + # TODO: figure out how to remove this with cmake + patchelf --remove-rpath "$lib" || die + dolib.so "$lib" + done } src_test() {