commit: ba7d11f6b86de39997e64ee61af78bbc4980d9ab Author: YiFei Zhu <zhuyifei1999 <AT> gmail <DOT> com> AuthorDate: Mon Jan 8 09:38:45 2024 +0000 Commit: YiFei Zhu <zhuyifei1999 <AT> gmail <DOT> com> CommitDate: Mon Jan 8 09:42:53 2024 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=ba7d11f6
sys-fs/dwarfs: Fix automatic insertion of -g into *FLAGS Also removed non-existent dolib.so. Neither of us has this file. Still need to figure out how to fix RUNPATH properly. Closes: https://bugs.gentoo.org/900016 Signed-off-by: YiFei Zhu <zhuyifei1999 <AT> gmail.com> sys-fs/dwarfs/dwarfs-0.7.4-r1.ebuild | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/sys-fs/dwarfs/dwarfs-0.7.4-r1.ebuild b/sys-fs/dwarfs/dwarfs-0.7.4-r1.ebuild index 71412cd46b..634400a408 100644 --- a/sys-fs/dwarfs/dwarfs-0.7.4-r1.ebuild +++ b/sys-fs/dwarfs/dwarfs-0.7.4-r1.ebuild @@ -17,8 +17,6 @@ KEYWORDS="~amd64" IUSE="python +jemalloc test man" S="${WORKDIR}/dwarfs-${PV}" -PATCHES=() - RDEPEND=" ${PYTHON_DEPS} app-arch/libarchive @@ -71,10 +69,18 @@ QA_SONAME=( "/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 + + # Bug #900016, but upstream discourages O3 + sed '/FLAGS_RELEASE/s# -O2 -g##' -i CMakeLists.txt || die + sed '/CMAKE_CXX_FLAGS_COMMON/s#-g ##' -i folly/CMake/FollyCompilerUnix.cmake || die + sed '/^\s*-g$/d' -i folly/CMake/FollyCompilerUnix.cmake || die + replace-flags -O3 -O2 + + cmake_src_prepare } src_configure(){ @@ -103,9 +109,6 @@ 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" - # 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(){
