commit: c3c28ff07137e515a5057f65e9bae72e3c754ce6 Author: Denis Reva <denis7774 <AT> gmail <DOT> com> AuthorDate: Sun Jan 7 11:05:29 2024 +0000 Commit: David Roman <davidroman96 <AT> gmail <DOT> com> CommitDate: Sun Jan 7 11:05:37 2024 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=c3c28ff0
sys-fs/dwarfs: Fix https://github.com/mhx/dwarfs/issues/184 Signed-off-by: Denis Reva <denis7774 <AT> gmail.com> sys-fs/dwarfs/Manifest | 1 - ...arfs-0.7.2-r1.ebuild => dwarfs-0.7.4-r1.ebuild} | 20 ++-- sys-fs/dwarfs/dwarfs-0.7.4.ebuild | 121 --------------------- 3 files changed, 7 insertions(+), 135 deletions(-) diff --git a/sys-fs/dwarfs/Manifest b/sys-fs/dwarfs/Manifest index 7219d4f076..1bf8f607a2 100644 --- a/sys-fs/dwarfs/Manifest +++ b/sys-fs/dwarfs/Manifest @@ -1,2 +1 @@ -DIST dwarfs-0.7.2.tar.xz 15108504 BLAKE2B 85cb90ea7d20c3c067c126dc7f7a65145041f6ef2853f96a89ca425a8a1dab9d49a0a21daa9590037aa0a9fcfc4f11fbb91d4417213318a699472532400017bb SHA512 5f455b4e15ac3ef5fba8cf26295c4bce19b613d5bc09781ed0a0fd77c2ae73b197e50dce411a21b856aababb59a1800e767c40d55f0f86d88badf021042c1fd6 DIST dwarfs-0.7.4.tar.xz 15112544 BLAKE2B 904c5f089589630ac10441ec86feb3a4df30ad901a809e93942970fbc32f05499d6996f73769d3ada10e7aa224ec71a50144d9d605d5df852c86116efc82c090 SHA512 b78e0544ea04200089efd970250417ace6a354ba3090f7f8cbe4b901c5575f752968d1720cdd6e35109920f1e363cf3b70d777a46addd2214c2f5fdf83f90e19 diff --git a/sys-fs/dwarfs/dwarfs-0.7.2-r1.ebuild b/sys-fs/dwarfs/dwarfs-0.7.4-r1.ebuild similarity index 82% rename from sys-fs/dwarfs/dwarfs-0.7.2-r1.ebuild rename to sys-fs/dwarfs/dwarfs-0.7.4-r1.ebuild index 983d49b3c8..9328090c37 100644 --- a/sys-fs/dwarfs/dwarfs-0.7.2-r1.ebuild +++ b/sys-fs/dwarfs/dwarfs-0.7.4-r1.ebuild @@ -49,7 +49,6 @@ RDEPEND=" DEPEND="${RDEPEND}" BDEPEND=" - dev-util/patchelf sys-devel/bison sys-devel/flex virtual/pkgconfig @@ -80,6 +79,7 @@ src_prepare(){ src_configure(){ append-cxxflags "-I/usr/include" + append-ldflags $(no-as-needed) mycmakeargs=( -DUSE_JEMALLOC=$(usex jemalloc ON OFF) @@ -95,22 +95,16 @@ src_configure(){ use python && mycmakeargs+=( "-DWITH_PYTHON_VERSION=${EPYTHON#python}" ) cmake_src_configure } -src_compile(){ - cmake_src_compile - # Remove insecure RPATH from bundled lib - patchelf --remove-rpath libdwarfs.so || die - patchelf --remove-rpath libdwarfs_tool.so || die - 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" + 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" + # See https://github.com/mhx/dwarfs/issues/184 + dolib.so folly/folly/experimental/exception_tracer/libfolly_exception_tracer_base.so || die "Install failed" + dolib.so folly/folly/experimental/exception_tracer/libfolly_exception_tracer_base.so.0.58.0-dev || die "Install failed" } pkg_postinst(){ diff --git a/sys-fs/dwarfs/dwarfs-0.7.4.ebuild b/sys-fs/dwarfs/dwarfs-0.7.4.ebuild deleted file mode 100644 index 983d49b3c8..0000000000 --- a/sys-fs/dwarfs/dwarfs-0.7.4.ebuild +++ /dev/null @@ -1,121 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..12} ) - -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}/${P}.tar.xz"; - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64" -IUSE="python +jemalloc test man" -S="${WORKDIR}/dwarfs-${PV}" - -PATCHES=() - -RDEPEND=" - ${PYTHON_DEPS} - app-arch/libarchive - app-arch/lz4 - app-arch/snappy - app-arch/xz-utils - app-arch/zstd - dev-cpp/gflags - dev-cpp/glog[gflags] - dev-cpp/parallel-hashmap:= - dev-libs/boost[context,python?] - dev-libs/double-conversion - dev-libs/libevent - dev-libs/libfmt - dev-libs/utfcpp - dev-libs/xxhash - sys-fs/fuse:3 - dev-libs/fsst - sys-libs/binutils-libs - sys-libs/libunwind - sys-libs/zlib - !dev-cpp/fbthrift - !dev-cpp/fizz - !dev-cpp/folly - !dev-cpp/wangle - jemalloc? ( >=dev-libs/jemalloc-5.3.0-r1 ) -" - -DEPEND="${RDEPEND}" -BDEPEND=" - dev-util/patchelf - sys-devel/bison - sys-devel/flex - virtual/pkgconfig - man? ( app-text/ronn-ng ) - test? ( dev-cpp/gtest ) -" - -DOCS=( "README.md" "CHANGES.md" "TODO" ) -RESTRICT="!test? ( test )" -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 - sed "s/DESTINATION lib/DESTINATION $(get_libdir)/" -i CMakeLists.txt || die -} - -src_configure(){ - append-cxxflags "-I/usr/include" - - mycmakeargs=( - -DUSE_JEMALLOC=$(usex jemalloc ON OFF) - -DWITH_PYTHON=$(usex python ON OFF) - -DWITH_TESTS=$(usex test ON OFF) - -DWITH_MAN_PAGES=$(usex man ON OFF) - -DPREFER_SYSTEM_ZSTD=ON - -DPREFER_SYSTEM_XXHASH=ON - -DPREFER_SYSTEM_GTEST=ON - -DPREFER_SYSTEM_LIBFMT=ON - -DWITH_LEGACY_FUSE=OFF - ) - use python && mycmakeargs+=( "-DWITH_PYTHON_VERSION=${EPYTHON#python}" ) - cmake_src_configure -} -src_compile(){ - cmake_src_compile - # Remove insecure RPATH from bundled lib - patchelf --remove-rpath libdwarfs.so || die - patchelf --remove-rpath libdwarfs_tool.so || die - 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(){ - elog "You may find more information in the" - elog "${HOMEPAGE}" - elog "About creating: ${HOMEPAGE}/blob/main/doc/mkdwarfs.md" - elog "About mounting: ${HOMEPAGE}/blob/main/doc/dwarfs.md" -}
