From 9af62856376919175e55dd886076f57173b2f714 Mon Sep 17 00:00:00 2001 From: Denis Reva Date: Thu, 10 Dec 2020 12:51:56 +0500 Subject: [PATCH] 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 --- ...{dwarfs-0.2.3-r2.ebuild => dwarfs-0.2.3-r3.ebuild} | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) rename sys-fs/dwarfs/{dwarfs-0.2.3-r2.ebuild => dwarfs-0.2.3-r3.ebuild} (92%) 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 050f388830..33378106cf 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"