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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 2A84013835A for ; Thu, 10 Dec 2020 08:46:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6EF97E0908; Thu, 10 Dec 2020 08:46:06 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 444D4E0903 for ; Thu, 10 Dec 2020 08:46:06 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 32E97340A3B for ; Thu, 10 Dec 2020 08:46:05 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 76FFB48E for ; Thu, 10 Dec 2020 08:46:02 +0000 (UTC) From: "Andrew Ammerlaan" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andrew Ammerlaan" Message-ID: <1607586716.9af62856376919175e55dd886076f57173b2f714.andrewammerlaan@gentoo> Subject: [gentoo-commits] repo/proj/guru:master commit in: sys-fs/dwarfs/ X-VCS-Repository: repo/proj/guru X-VCS-Files: sys-fs/dwarfs/dwarfs-0.2.3-r2.ebuild sys-fs/dwarfs/dwarfs-0.2.3-r3.ebuild X-VCS-Directories: sys-fs/dwarfs/ X-VCS-Committer: andrewammerlaan X-VCS-Committer-Name: Andrew Ammerlaan X-VCS-Revision: 9af62856376919175e55dd886076f57173b2f714 X-VCS-Branch: master Date: Thu, 10 Dec 2020 08:46:02 +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: 212e4717-f8ba-4183-9102-36f21355e373 X-Archives-Hash: 414fddcaa85ded81023a9f2cc7bb6618 commit: 9af62856376919175e55dd886076f57173b2f714 Author: Denis Reva gmail com> AuthorDate: Thu Dec 10 07:51:56 2020 +0000 Commit: Andrew Ammerlaan riseup net> CommitDate: Thu Dec 10 07:51:56 2020 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=9af62856 sys-fs/dwarfs: fixed bug with installation of libraries Fixed a bug where libraries are not properly installed Fixed a conflict with dev-cpp/folly (the package use bundled ones) Package-Manager: Portage-3.0.9, Repoman-3.0.2 Signed-off-by: Denis Reva gmail.com> .../dwarfs/{dwarfs-0.2.3-r2.ebuild => dwarfs-0.2.3-r3.ebuild} | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/sys-fs/dwarfs/dwarfs-0.2.3-r2.ebuild b/sys-fs/dwarfs/dwarfs-0.2.3-r3.ebuild similarity index 92% rename from sys-fs/dwarfs/dwarfs-0.2.3-r2.ebuild rename to sys-fs/dwarfs/dwarfs-0.2.3-r3.ebuild index 050f3888..33378106 100644 --- a/sys-fs/dwarfs/dwarfs-0.2.3-r2.ebuild +++ b/sys-fs/dwarfs/dwarfs-0.2.3-r3.ebuild @@ -36,7 +36,8 @@ RDEPEND="dev-libs/boost[context,threads] sys-fs/fuse:3 sys-libs/binutils-libs sys-libs/zlib - sys-libs/libunwind" + sys-libs/libunwind + !dev-cpp/folly" BDEPEND="app-text/ronn dev-util/cmake sys-apps/sed @@ -47,6 +48,8 @@ CHECKREQS_DISK_BUILD="512M" DOCS=( "README.md" "CHANGES.md" "TODO" ) +CMAKE_IN_SOURCE_BUILD=true + src_unpack(){ default rm -d "${S}"/fbthrift/ @@ -69,6 +72,12 @@ src_prepare(){ cmake_src_prepare } +src_install(){ + default + dolib.so libmetadata_thrift.so libthrift_light.so + dolib.so folly/libfolly.so.0.58.0-dev folly/libfolly.so +} + pkg_postinst(){ elog "Test shows that dwarfs compiled with Clang is substantially faster than GCC ones" elog "See https://github.com/mhx/dwarfs/issues/14"