* [gentoo-commits] repo/proj/guru:dev commit in: sys-fs/dwarfs/, sys-fs/dwarfs/files/
@ 2021-03-15 9:06 Denis Reva
0 siblings, 0 replies; 5+ messages in thread
From: Denis Reva @ 2021-03-15 9:06 UTC (permalink / raw
To: gentoo-commits
commit: a6d985328dd0cb18ead40cb151399f8f4a272882
Author: Denis Reva <denis7774 <AT> gmail <DOT> com>
AuthorDate: Mon Mar 15 09:06:04 2021 +0000
Commit: Denis Reva <denis7774 <AT> gmail <DOT> com>
CommitDate: Mon Mar 15 09:06:18 2021 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=a6d98532
sys-fs/dwarfs: updated to 0.4.1
New:
* The segmenting code now uses a bloom filter to
discard unsuccessful matches as early and quickly as possible
* nilsimsa similarity computation has been improved
Fixed:
* GCC builds https://github.com/mhx/dwarfs/issues/14
* Libarchive https://github.com/mhx/dwarfs/issues/36
* mkdwarfs catch certain exceptions correctly
Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Denis Reva <denis7774 <AT> gmail.com>
sys-fs/dwarfs/Manifest | 2 +-
.../{dwarfs-0.4.0.ebuild => dwarfs-0.4.1.ebuild} | 13 +++----------
sys-fs/dwarfs/files/dwarfs-0.4.0-link.patch | 20 --------------------
3 files changed, 4 insertions(+), 31 deletions(-)
diff --git a/sys-fs/dwarfs/Manifest b/sys-fs/dwarfs/Manifest
index 888cd4ad..0ddfe0d6 100644
--- a/sys-fs/dwarfs/Manifest
+++ b/sys-fs/dwarfs/Manifest
@@ -1 +1 @@
-DIST dwarfs-0.4.0.tar.bz2 11634383 BLAKE2B a401e891f5453bd8cccbc664066f759c5ffa60568305b44d57fbcc239d6759ff2e6d5fb1450c7424be14e9eb7ab4f9996dce54a78de6e6e5d8b1cbe2d15dc4eb SHA512 b815c4bdb1ac61798ead817f27d8fbfaf234d2698d9f72427b7cd55fd334214f595baf286c979fee344b34c7589d5859df8c6e8259473bf13d7461f1f63d90a6
+DIST dwarfs-0.4.1.tar.bz2 11640169 BLAKE2B 3490d625fd718be4451d5a551b6931b0c9316d88cdda91b90a724f3ab732a3916431a13e343bcb79a2e0415ffc0a990d2546eeb1738c55282e9fb9c85d3ba1ae SHA512 ed7bfe13a9ed2450921a2caf47b4ee1f527fcd7ad154cee93d8674a2dd08c9110d62cfaff22f318bdb799eeea35b8bc4b7374d685537c82e70a0498d97a53307
diff --git a/sys-fs/dwarfs/dwarfs-0.4.0.ebuild b/sys-fs/dwarfs/dwarfs-0.4.1.ebuild
similarity index 79%
rename from sys-fs/dwarfs/dwarfs-0.4.0.ebuild
rename to sys-fs/dwarfs/dwarfs-0.4.1.ebuild
index 9a4fc653..2b5bcade 100644
--- a/sys-fs/dwarfs/dwarfs-0.4.0.ebuild
+++ b/sys-fs/dwarfs/dwarfs-0.4.1.ebuild
@@ -49,9 +49,7 @@ BDEPEND="app-text/ronn
sys-devel/bison
virtual/pkgconfig"
-CHECKREQS_DISK_BUILD="13000M"
-
-PATCHES=( ${FILESDIR}/dwarfs-0.4.0-link.patch )
+CHECKREQS_DISK_BUILD="1300M"
DOCS=( "README.md" "CHANGES.md" "TODO" )
@@ -85,13 +83,8 @@ src_install(){
}
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"
- elog "So you may want to compile it independently with Clang by the"
- elog "https://wiki.gentoo.org/wiki/Clang"
- elog "And with the per-package settings:"
- elog "https://wiki.gentoo.org/wiki/Handbook:AMD64/Portage/Advanced#Per-package_environment_variables"
- elog "Also you may find more information in the"
+ elog "Since version 0.4.1 GGC builds has been fixed. Now both Clang and GCC are working very well"
+ 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"
diff --git a/sys-fs/dwarfs/files/dwarfs-0.4.0-link.patch b/sys-fs/dwarfs/files/dwarfs-0.4.0-link.patch
deleted file mode 100644
index 93c4b4f2..00000000
--- a/sys-fs/dwarfs/files/dwarfs-0.4.0-link.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 18fa5cd..36fc0b3 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -258,8 +258,6 @@ add_executable(dwarfsextract src/dwarfsextract.cpp)
-
- list(APPEND BINARY_TARGETS mkdwarfs dwarfsck dwarfsbench dwarfsextract)
-
--target_link_libraries(dwarfsextract PkgConfig::LIBARCHIVE)
--
- if(FUSE3_FOUND)
- add_executable(dwarfs-bin src/dwarfs.cpp)
- target_compile_definitions(dwarfs-bin PRIVATE _FILE_OFFSET_BITS=64
-@@ -482,6 +480,7 @@ target_link_libraries(
- thrift_light
- folly
- ${Boost_LIBRARIES}
-+ PkgConfig::LIBARCHIVE
- PkgConfig::LIBLZ4
- PkgConfig::LIBLZMA)
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: sys-fs/dwarfs/, sys-fs/dwarfs/files/
@ 2021-04-28 21:21 Alessandro Barbieri
0 siblings, 0 replies; 5+ messages in thread
From: Alessandro Barbieri @ 2021-04-28 21:21 UTC (permalink / raw
To: gentoo-commits
commit: c00dbd5fd54a3b9f6cfecfad906f30cc2d551bf2
Author: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
AuthorDate: Wed Apr 28 21:21:04 2021 +0000
Commit: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
CommitDate: Wed Apr 28 21:21:04 2021 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=c00dbd5f
sys-fs/dwarfs: fix patch and ebuild
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com>
sys-fs/dwarfs/dwarfs-0.5.4-r3.ebuild | 1 -
sys-fs/dwarfs/files/unbundle-folly-fbthrift.patch | 4 ++--
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/sys-fs/dwarfs/dwarfs-0.5.4-r3.ebuild b/sys-fs/dwarfs/dwarfs-0.5.4-r3.ebuild
index f45a47b0b..fb546ce27 100644
--- a/sys-fs/dwarfs/dwarfs-0.5.4-r3.ebuild
+++ b/sys-fs/dwarfs/dwarfs-0.5.4-r3.ebuild
@@ -57,7 +57,6 @@ BDEPEND="
test? ( dev-cpp/gtest )
"
->>>>>>> f29f4045 (sys-fs/dwarfs: unbundling WIP):sys-fs/dwarfs/dwarfs-0.5.4-r1.ebuild
CHECKREQS_DISK_BUILD="1300M"
diff --git a/sys-fs/dwarfs/files/unbundle-folly-fbthrift.patch b/sys-fs/dwarfs/files/unbundle-folly-fbthrift.patch
index 62f4ee1f9..853ebe046 100644
--- a/sys-fs/dwarfs/files/unbundle-folly-fbthrift.patch
+++ b/sys-fs/dwarfs/files/unbundle-folly-fbthrift.patch
@@ -1,5 +1,5 @@
---- CMakeLists.txt 2021-04-28 16:56:24.432666631 +0200
-+++ CMakeLists.txt2 2021-04-28 17:00:04.622812742 +0200
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
@@ -298,7 +298,7 @@
if(WITH_TESTS OR WITH_BENCHMARKS)
add_library(test_helpers test/test_helpers.cpp test/test_strings.cpp
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: sys-fs/dwarfs/, sys-fs/dwarfs/files/
@ 2021-05-02 1:51 Alessandro Barbieri
0 siblings, 0 replies; 5+ messages in thread
From: Alessandro Barbieri @ 2021-05-02 1:51 UTC (permalink / raw
To: gentoo-commits
commit: 7f85b03b40d50a70620210159852030bb82eb3de
Author: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
AuthorDate: Sun May 2 01:49:27 2021 +0000
Commit: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
CommitDate: Sun May 2 01:51:05 2021 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=7f85b03b
sys-fs/dwarfs: unbundling WIP
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com>
sys-fs/dwarfs/dwarfs-0.5.4-r3.ebuild | 8 +-
sys-fs/dwarfs/files/unbundle.patch | 177 +++++++++++++++++++++++++++++++++++
2 files changed, 182 insertions(+), 3 deletions(-)
diff --git a/sys-fs/dwarfs/dwarfs-0.5.4-r3.ebuild b/sys-fs/dwarfs/dwarfs-0.5.4-r3.ebuild
index 8c35e1298..0de8a6544 100644
--- a/sys-fs/dwarfs/dwarfs-0.5.4-r3.ebuild
+++ b/sys-fs/dwarfs/dwarfs-0.5.4-r3.ebuild
@@ -14,13 +14,13 @@ SRC_URI="https://github.com/mhx/dwarfs/releases/download/v${PV}/${P}.tar.bz2"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64"
IUSE="python +jemalloc test"
RESTRICT="!test? ( test )"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-PATCHES=( "${WORKDIR}/unbundle-folly-fbthrift.patch" )
+PATCHES=( "${FILESDIR}/unbundle.patch" )
#TODO: unbundle libfsst
RDEPEND="
@@ -34,6 +34,7 @@ RDEPEND="
dev-cpp/folly:=
dev-cpp/gflags
dev-cpp/glog[gflags]
+ dev-cpp/parallel-hashmap:=
dev-cpp/sparsehash
dev-libs/boost[context,threads,python?]
dev-libs/double-conversion
@@ -68,13 +69,14 @@ CMAKE_IN_SOURCE_BUILD=1
CMAKE_WARN_UNUSED_CLI=0
src_prepare(){
+ rm -r fsst zstd fbthrift folly xxHash parallel-hashmap || die
cmake_src_prepare
einfo "setting library path to $(get_libdir)"
sed "s/DESTINATION lib/DESTINATION $(get_libdir)/" -i CMakeLists.txt || die
}
src_configure(){
- append-cxxflag "-I/usr/include/folly"
+ append-cxxflags "-I/usr/include"
einfo "setting configuration flags to:"
mycmakeargs=(
diff --git a/sys-fs/dwarfs/files/unbundle.patch b/sys-fs/dwarfs/files/unbundle.patch
new file mode 100644
index 000000000..ad9588c54
--- /dev/null
+++ b/sys-fs/dwarfs/files/unbundle.patch
@@ -0,0 +1,177 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -142,8 +142,6 @@
+ ON
+ CACHE BOOL "only build thrift compiler")
+
+-add_subdirectory(folly EXCLUDE_FROM_ALL)
+-add_subdirectory(fbthrift EXCLUDE_FROM_ALL)
+ if(NOT (ZSTD_FOUND AND PREFER_SYSTEM_ZSTD))
+ add_subdirectory(zstd/build/cmake EXCLUDE_FROM_ALL)
+ endif()
+@@ -298,7 +296,6 @@
+ if(WITH_TESTS OR WITH_BENCHMARKS)
+ add_library(test_helpers test/test_helpers.cpp test/test_strings.cpp
+ test/loremipsum.cpp)
+- target_link_libraries(test_helpers dwarfs folly)
+ set_property(TARGET test_helpers PROPERTY CXX_STANDARD 17)
+ endif()
+
+@@ -364,70 +361,7 @@
+
+ list(
+ APPEND
+- FROZEN_THRIFT_SRC
+- ${CMAKE_CURRENT_BINARY_DIR}/thrift/lib/thrift/gen-cpp2/frozen_data.h
+- ${CMAKE_CURRENT_BINARY_DIR}/thrift/lib/thrift/gen-cpp2/frozen_data.cpp
+- ${CMAKE_CURRENT_BINARY_DIR}/thrift/lib/thrift/gen-cpp2/frozen_types.h
+- ${CMAKE_CURRENT_BINARY_DIR}/thrift/lib/thrift/gen-cpp2/frozen_types.tcc
+- ${CMAKE_CURRENT_BINARY_DIR}/thrift/lib/thrift/gen-cpp2/frozen_types.cpp
+- ${CMAKE_CURRENT_BINARY_DIR}/thrift/lib/thrift/gen-cpp2/frozen_types_custom_protocol.h
+- ${CMAKE_CURRENT_BINARY_DIR}/thrift/lib/thrift/gen-cpp2/frozen_constants.h
+- ${CMAKE_CURRENT_BINARY_DIR}/thrift/lib/thrift/gen-cpp2/frozen_constants.cpp
+- ${CMAKE_CURRENT_BINARY_DIR}/thrift/lib/thrift/gen-cpp2/frozen_metadata.h
+- ${CMAKE_CURRENT_BINARY_DIR}/thrift/lib/thrift/gen-cpp2/frozen_metadata.cpp
+- ${CMAKE_CURRENT_BINARY_DIR}/thrift/lib/thrift/gen-cpp2/frozen_visitation.h
+- ${CMAKE_CURRENT_BINARY_DIR}/thrift/lib/thrift/gen-cpp2/frozen_for_each_field.h
+- ${CMAKE_CURRENT_BINARY_DIR}/thrift/lib/thrift/gen-cpp2/frozen_visit_union.h)
+-
+-list(
+- APPEND
+- METADATA_THRIFT_SRC
+- ${CMAKE_CURRENT_BINARY_DIR}/thrift/dwarfs/gen-cpp2/metadata_constants.cpp
+- ${CMAKE_CURRENT_BINARY_DIR}/thrift/dwarfs/gen-cpp2/metadata_constants.h
+- ${CMAKE_CURRENT_BINARY_DIR}/thrift/dwarfs/gen-cpp2/metadata_data.cpp
+- ${CMAKE_CURRENT_BINARY_DIR}/thrift/dwarfs/gen-cpp2/metadata_data.h
+- ${CMAKE_CURRENT_BINARY_DIR}/thrift/dwarfs/gen-cpp2/metadata_for_each_field.h
+- ${CMAKE_CURRENT_BINARY_DIR}/thrift/dwarfs/gen-cpp2/metadata_layouts.cpp
+- ${CMAKE_CURRENT_BINARY_DIR}/thrift/dwarfs/gen-cpp2/metadata_layouts.h
+- ${CMAKE_CURRENT_BINARY_DIR}/thrift/dwarfs/gen-cpp2/metadata_metadata.cpp
+- ${CMAKE_CURRENT_BINARY_DIR}/thrift/dwarfs/gen-cpp2/metadata_metadata.h
+- ${CMAKE_CURRENT_BINARY_DIR}/thrift/dwarfs/gen-cpp2/metadata_types.cpp
+- ${CMAKE_CURRENT_BINARY_DIR}/thrift/dwarfs/gen-cpp2/metadata_types.h
+- ${CMAKE_CURRENT_BINARY_DIR}/thrift/dwarfs/gen-cpp2/metadata_types.tcc
+- ${CMAKE_CURRENT_BINARY_DIR}/thrift/dwarfs/gen-cpp2/metadata_types_custom_protocol.h
+- ${CMAKE_CURRENT_BINARY_DIR}/thrift/dwarfs/gen-cpp2/metadata_visit_union.h
+- ${CMAKE_CURRENT_BINARY_DIR}/thrift/dwarfs/gen-cpp2/metadata_visitation.h)
+-
+-add_custom_command(
+- OUTPUT ${FROZEN_THRIFT_SRC}
+- COMMAND mkdir -p ${CMAKE_CURRENT_BINARY_DIR}/thrift/lib/thrift
+- COMMAND
+- cp ${CMAKE_CURRENT_SOURCE_DIR}/fbthrift/thrift/lib/thrift/frozen.thrift
+- ${CMAKE_CURRENT_BINARY_DIR}/thrift/lib/thrift/
+- COMMAND cd ${CMAKE_CURRENT_BINARY_DIR}/thrift/lib/thrift &&
+- ${CMAKE_CURRENT_BINARY_DIR}/bin/thrift1 --gen mstch_cpp2 frozen.thrift
+- DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/bin/thrift1
+- ${CMAKE_CURRENT_SOURCE_DIR}/fbthrift/thrift/lib/thrift/frozen.thrift)
+-
+-add_custom_command(
+- OUTPUT ${METADATA_THRIFT_SRC}
+- COMMAND mkdir -p ${CMAKE_CURRENT_BINARY_DIR}/thrift/dwarfs
+- COMMAND cp ${CMAKE_CURRENT_SOURCE_DIR}/thrift/metadata.thrift
+- thrift/dwarfs/metadata.thrift
+- COMMAND
+- cd ${CMAKE_CURRENT_BINARY_DIR}/thrift/dwarfs &&
+- ${CMAKE_CURRENT_BINARY_DIR}/bin/thrift1 --gen mstch_cpp2:frozen2
+- metadata.thrift
+- DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/bin/thrift1
+- ${CMAKE_CURRENT_SOURCE_DIR}/thrift/metadata.thrift)
+-
+-list(
+- APPEND
+ INCLUDE_DIRS
+- ${CMAKE_CURRENT_BINARY_DIR}/folly
+- ${CMAKE_CURRENT_BINARY_DIR}/thrift
+- ${CMAKE_CURRENT_SOURCE_DIR}/folly
+- ${CMAKE_CURRENT_SOURCE_DIR}/fbthrift
+ ${CMAKE_CURRENT_BINARY_DIR})
+
+ if(NOT (ZSTD_FOUND AND PREFER_SYSTEM_ZSTD))
+@@ -445,39 +379,6 @@
+ list(APPEND INCLUDE_DIRS ${Jemalloc_INCLUDE_DIRS})
+ endif()
+
+-add_library(
+- thrift_light
+- ${CMAKE_CURRENT_SOURCE_DIR}/fbthrift/thrift/lib/cpp2/FieldRef.cpp
+- ${CMAKE_CURRENT_SOURCE_DIR}/fbthrift/thrift/lib/cpp2/protocol/CompactProtocol.cpp
+- ${CMAKE_CURRENT_SOURCE_DIR}/fbthrift/thrift/lib/cpp2/protocol/BinaryProtocol.cpp
+- ${CMAKE_CURRENT_SOURCE_DIR}/fbthrift/thrift/lib/cpp2/protocol/DebugProtocol.cpp
+- ${CMAKE_CURRENT_SOURCE_DIR}/fbthrift/thrift/lib/cpp2/protocol/JSONProtocolCommon.cpp
+- ${CMAKE_CURRENT_SOURCE_DIR}/fbthrift/thrift/lib/cpp2/protocol/JSONProtocol.cpp
+- ${CMAKE_CURRENT_SOURCE_DIR}/fbthrift/thrift/lib/cpp/protocol/TProtocolException.cpp
+- ${CMAKE_CURRENT_SOURCE_DIR}/fbthrift/thrift/lib/cpp/util/VarintUtils.cpp
+- ${CMAKE_CURRENT_SOURCE_DIR}/fbthrift/thrift/lib/cpp2/gen/module_types_cpp.cpp
+- ${CMAKE_CURRENT_SOURCE_DIR}/fbthrift/thrift/lib/cpp2/frozen/Frozen.cpp
+- ${CMAKE_CURRENT_SOURCE_DIR}/fbthrift/thrift/lib/cpp2/frozen/FrozenUtil.cpp
+- ${CMAKE_CURRENT_SOURCE_DIR}/fbthrift/thrift/lib/cpp2/frozen/schema/MemorySchema.cpp
+- ${CMAKE_CURRENT_BINARY_DIR}/thrift/lib/thrift/gen-cpp2/frozen_data.cpp
+- ${CMAKE_CURRENT_BINARY_DIR}/thrift/lib/thrift/gen-cpp2/frozen_types.cpp)
+-
+-set_property(TARGET thrift_light PROPERTY CXX_STANDARD 17)
+-
+-target_include_directories(thrift_light PRIVATE ${INCLUDE_DIRS})
+-
+-add_library(
+- metadata_thrift
+- ${CMAKE_CURRENT_BINARY_DIR}/thrift/dwarfs/gen-cpp2/metadata_layouts.cpp
+- ${CMAKE_CURRENT_BINARY_DIR}/thrift/dwarfs/gen-cpp2/metadata_types.cpp
+- ${CMAKE_CURRENT_BINARY_DIR}/thrift/dwarfs/gen-cpp2/metadata_data.cpp)
+-
+-set_property(TARGET metadata_thrift PROPERTY CXX_STANDARD 17)
+-
+-target_include_directories(metadata_thrift PRIVATE ${INCLUDE_DIRS})
+-
+-add_dependencies(metadata_thrift thrift_light)
+-
+ foreach(tgt dwarfs ${BINARY_TARGETS})
+ target_include_directories(
+ ${tgt} SYSTEM
+@@ -501,8 +402,6 @@
+ set_property(TARGET ${tgt} PROPERTY CXX_STANDARD_REQUIRED ON)
+ set_property(TARGET ${tgt} PROPERTY CXX_EXTENSIONS OFF)
+
+- add_dependencies(${tgt} metadata_thrift)
+-
+ if(ENABLE_ASAN)
+ target_compile_options(${tgt} PRIVATE -fsanitize=address
+ -fno-omit-frame-pointer)
+@@ -535,25 +434,8 @@
+ endif()
+ endforeach()
+
+-# not sure why exactly, copied from fsst/CMakeLists.txt
+-if(CMAKE_BUILD_TYPE STREQUAL Release)
+- set_source_files_properties(fsst/fsst_avx512.cpp PROPERTIES COMPILE_FLAGS -O1)
+-endif()
+-
+-add_library(
+- fsst
+- fsst/libfsst.cpp fsst/fsst_avx512.cpp fsst/fsst_avx512_unroll1.inc
+- fsst/fsst_avx512_unroll2.inc fsst/fsst_avx512_unroll3.inc
+- fsst/fsst_avx512_unroll4.inc)
+-
+-target_include_directories(dwarfs PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/fsst)
+-
+ target_link_libraries(
+ dwarfs
+- metadata_thrift
+- thrift_light
+- folly
+- fsst
+ ${Boost_LIBRARIES}
+ PkgConfig::LIBARCHIVE
+ PkgConfig::LIBLZ4
+@@ -582,11 +464,6 @@
+ if(USE_JEMALLOC)
+ target_link_libraries(${tgt} ${Jemalloc_LIBRARIES})
+ endif()
+- if(TARGET folly_exception_tracer)
+- target_link_libraries(
+- ${tgt} -Wl,--whole-archive folly_exception_tracer_base
+- folly_exception_tracer -Wl,--no-whole-archive)
+- endif()
+ endforeach()
+
+ if(STATIC_BUILD_DO_NOT_USE)
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: sys-fs/dwarfs/, sys-fs/dwarfs/files/
@ 2021-10-28 15:18 Alessandro Barbieri
0 siblings, 0 replies; 5+ messages in thread
From: Alessandro Barbieri @ 2021-10-28 15:18 UTC (permalink / raw
To: gentoo-commits
commit: fbbb893b131e4b9511f1b5862a4f757605188fac
Author: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
AuthorDate: Thu Oct 28 15:15:15 2021 +0000
Commit: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
CommitDate: Thu Oct 28 15:15:15 2021 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=fbbb893b
sys-fs/dwarfs: unbundle libraries
Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com>
...arfs-0.5.4-r3.ebuild => dwarfs-0.5.6-r2.ebuild} | 24 ++--
...{unbundle.patch => dwarfs-0.5.6-unbundle.patch} | 116 +++++++---------
sys-fs/dwarfs/files/unbundle-folly-fbthrift.patch | 153 ---------------------
3 files changed, 58 insertions(+), 235 deletions(-)
diff --git a/sys-fs/dwarfs/dwarfs-0.5.4-r3.ebuild b/sys-fs/dwarfs/dwarfs-0.5.6-r2.ebuild
similarity index 84%
rename from sys-fs/dwarfs/dwarfs-0.5.4-r3.ebuild
rename to sys-fs/dwarfs/dwarfs-0.5.6-r2.ebuild
index d7e1a77f3..0aa97f7eb 100644
--- a/sys-fs/dwarfs/dwarfs-0.5.4-r3.ebuild
+++ b/sys-fs/dwarfs/dwarfs-0.5.6-r2.ebuild
@@ -9,19 +9,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.bz2"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS=""
-
+KEYWORDS="~amd64"
IUSE="python +jemalloc test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-PATCHES=( "${FILESDIR}/unbundle.patch" )
-#TODO: unbundle libfsst
RDEPEND="
${PYTHON_DEPS}
@@ -36,7 +29,7 @@ RDEPEND="
dev-cpp/glog[gflags]
dev-cpp/parallel-hashmap:=
dev-cpp/sparsehash
- dev-libs/boost[context,threads,python?]
+ dev-libs/boost[context,threads(+),python?]
dev-libs/double-conversion
dev-libs/fsst:=
dev-libs/libevent
@@ -61,24 +54,24 @@ BDEPEND="
test? ( dev-cpp/gtest )
"
-CHECKREQS_DISK_BUILD="1300M"
-
DOCS=( "README.md" "CHANGES.md" "TODO" )
+RESTRICT="!test? ( test )"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+PATCHES=( "${FILESDIR}/${P}-unbundle.patch" )
+CHECKREQS_DISK_BUILD="1300M"
CMAKE_IN_SOURCE_BUILD=1
CMAKE_WARN_UNUSED_CLI=0
src_prepare(){
- rm -r fsst zstd fbthrift folly xxHash parallel-hashmap || die
+ rm -r fsst zstd fbthrift/* folly xxHash parallel-hashmap || die
cmake_src_prepare
- einfo "setting library path to $(get_libdir)"
sed "s/DESTINATION lib/DESTINATION $(get_libdir)/" -i CMakeLists.txt || die
}
src_configure(){
append-cxxflags "-I/usr/include"
- einfo "setting configuration flags to:"
mycmakeargs=(
-DUSE_JEMALLOC=$(usex jemalloc ON OFF)
-DWITH_PYTHON=$(usex python ON OFF)
@@ -88,8 +81,7 @@ src_configure(){
-DPREFER_SYSTEM_GTEST=1
-DWITH_LEGACY_FUSE=0
)
- if use python; then mycmakeargs+=( -DWITH_PYTHON_VERSION=${EPYTHON#python} ); fi
- einfo ${mycmakeargs}
+ use python && mycmakeargs+=( "-DWITH_PYTHON_VERSION=${EPYTHON#python}" )
cmake_src_configure
}
diff --git a/sys-fs/dwarfs/files/unbundle.patch b/sys-fs/dwarfs/files/dwarfs-0.5.6-unbundle.patch
similarity index 62%
rename from sys-fs/dwarfs/files/unbundle.patch
rename to sys-fs/dwarfs/files/dwarfs-0.5.6-unbundle.patch
index ad9588c54..101af0dc6 100644
--- a/sys-fs/dwarfs/files/unbundle.patch
+++ b/sys-fs/dwarfs/files/dwarfs-0.5.6-unbundle.patch
@@ -1,6 +1,6 @@
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -142,8 +142,6 @@
+@@ -151,8 +151,6 @@
ON
CACHE BOOL "only build thrift compiler")
@@ -9,15 +9,7 @@
if(NOT (ZSTD_FOUND AND PREFER_SYSTEM_ZSTD))
add_subdirectory(zstd/build/cmake EXCLUDE_FROM_ALL)
endif()
-@@ -298,7 +296,6 @@
- if(WITH_TESTS OR WITH_BENCHMARKS)
- add_library(test_helpers test/test_helpers.cpp test/test_strings.cpp
- test/loremipsum.cpp)
-- target_link_libraries(test_helpers dwarfs folly)
- set_property(TARGET test_helpers PROPERTY CXX_STANDARD 17)
- endif()
-
-@@ -364,70 +361,7 @@
+@@ -383,23 +381,6 @@
list(
APPEND
@@ -38,24 +30,13 @@
-
-list(
- APPEND
-- METADATA_THRIFT_SRC
-- ${CMAKE_CURRENT_BINARY_DIR}/thrift/dwarfs/gen-cpp2/metadata_constants.cpp
-- ${CMAKE_CURRENT_BINARY_DIR}/thrift/dwarfs/gen-cpp2/metadata_constants.h
-- ${CMAKE_CURRENT_BINARY_DIR}/thrift/dwarfs/gen-cpp2/metadata_data.cpp
-- ${CMAKE_CURRENT_BINARY_DIR}/thrift/dwarfs/gen-cpp2/metadata_data.h
-- ${CMAKE_CURRENT_BINARY_DIR}/thrift/dwarfs/gen-cpp2/metadata_for_each_field.h
-- ${CMAKE_CURRENT_BINARY_DIR}/thrift/dwarfs/gen-cpp2/metadata_layouts.cpp
-- ${CMAKE_CURRENT_BINARY_DIR}/thrift/dwarfs/gen-cpp2/metadata_layouts.h
-- ${CMAKE_CURRENT_BINARY_DIR}/thrift/dwarfs/gen-cpp2/metadata_metadata.cpp
-- ${CMAKE_CURRENT_BINARY_DIR}/thrift/dwarfs/gen-cpp2/metadata_metadata.h
-- ${CMAKE_CURRENT_BINARY_DIR}/thrift/dwarfs/gen-cpp2/metadata_types.cpp
-- ${CMAKE_CURRENT_BINARY_DIR}/thrift/dwarfs/gen-cpp2/metadata_types.h
-- ${CMAKE_CURRENT_BINARY_DIR}/thrift/dwarfs/gen-cpp2/metadata_types.tcc
-- ${CMAKE_CURRENT_BINARY_DIR}/thrift/dwarfs/gen-cpp2/metadata_types_custom_protocol.h
-- ${CMAKE_CURRENT_BINARY_DIR}/thrift/dwarfs/gen-cpp2/metadata_visit_union.h
-- ${CMAKE_CURRENT_BINARY_DIR}/thrift/dwarfs/gen-cpp2/metadata_visitation.h)
--
--add_custom_command(
+ METADATA_THRIFT_SRC
+ ${CMAKE_CURRENT_BINARY_DIR}/thrift/dwarfs/gen-cpp2/metadata_constants.cpp
+ ${CMAKE_CURRENT_BINARY_DIR}/thrift/dwarfs/gen-cpp2/metadata_constants.h
+@@ -418,35 +399,20 @@
+ ${CMAKE_CURRENT_BINARY_DIR}/thrift/dwarfs/gen-cpp2/metadata_visitation.h)
+
+ add_custom_command(
- OUTPUT ${FROZEN_THRIFT_SRC}
- COMMAND mkdir -p ${CMAKE_CURRENT_BINARY_DIR}/thrift/lib/thrift
- COMMAND
@@ -67,32 +48,33 @@
- ${CMAKE_CURRENT_SOURCE_DIR}/fbthrift/thrift/lib/thrift/frozen.thrift)
-
-add_custom_command(
-- OUTPUT ${METADATA_THRIFT_SRC}
-- COMMAND mkdir -p ${CMAKE_CURRENT_BINARY_DIR}/thrift/dwarfs
-- COMMAND cp ${CMAKE_CURRENT_SOURCE_DIR}/thrift/metadata.thrift
-- thrift/dwarfs/metadata.thrift
-- COMMAND
-- cd ${CMAKE_CURRENT_BINARY_DIR}/thrift/dwarfs &&
+ OUTPUT ${METADATA_THRIFT_SRC}
+ COMMAND mkdir -p ${CMAKE_CURRENT_BINARY_DIR}/thrift/dwarfs
+ COMMAND cp ${CMAKE_CURRENT_SOURCE_DIR}/thrift/metadata.thrift
+ thrift/dwarfs/metadata.thrift
+ COMMAND
+ cd ${CMAKE_CURRENT_BINARY_DIR}/thrift/dwarfs &&
- ${CMAKE_CURRENT_BINARY_DIR}/bin/thrift1 --gen mstch_cpp2:frozen2
-- metadata.thrift
++ thrift1 --gen mstch_cpp2:frozen2
+ metadata.thrift
- DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/bin/thrift1
- ${CMAKE_CURRENT_SOURCE_DIR}/thrift/metadata.thrift)
--
--list(
-- APPEND
++ DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/thrift/metadata.thrift)
+
+ list(
+ APPEND
INCLUDE_DIRS
- ${CMAKE_CURRENT_BINARY_DIR}/folly
-- ${CMAKE_CURRENT_BINARY_DIR}/thrift
+ ${CMAKE_CURRENT_BINARY_DIR}/thrift
- ${CMAKE_CURRENT_SOURCE_DIR}/folly
- ${CMAKE_CURRENT_SOURCE_DIR}/fbthrift
${CMAKE_CURRENT_BINARY_DIR})
if(NOT (ZSTD_FOUND AND PREFER_SYSTEM_ZSTD))
-@@ -445,39 +379,6 @@
- list(APPEND INCLUDE_DIRS ${Jemalloc_INCLUDE_DIRS})
+@@ -472,43 +438,24 @@
endif()
--add_library(
+ add_library(
- thrift_light
- ${CMAKE_CURRENT_SOURCE_DIR}/fbthrift/thrift/lib/cpp2/FieldRef.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/fbthrift/thrift/lib/cpp2/protocol/CompactProtocol.cpp
@@ -114,30 +96,32 @@
-target_include_directories(thrift_light PRIVATE ${INCLUDE_DIRS})
-
-add_library(
-- metadata_thrift
-- ${CMAKE_CURRENT_BINARY_DIR}/thrift/dwarfs/gen-cpp2/metadata_layouts.cpp
-- ${CMAKE_CURRENT_BINARY_DIR}/thrift/dwarfs/gen-cpp2/metadata_types.cpp
-- ${CMAKE_CURRENT_BINARY_DIR}/thrift/dwarfs/gen-cpp2/metadata_data.cpp)
--
--set_property(TARGET metadata_thrift PROPERTY CXX_STANDARD 17)
+ metadata_thrift
++ STATIC
+ ${CMAKE_CURRENT_BINARY_DIR}/thrift/dwarfs/gen-cpp2/metadata_layouts.cpp
+ ${CMAKE_CURRENT_BINARY_DIR}/thrift/dwarfs/gen-cpp2/metadata_types.cpp
+ ${CMAKE_CURRENT_BINARY_DIR}/thrift/dwarfs/gen-cpp2/metadata_data.cpp)
+
+ set_property(TARGET metadata_thrift PROPERTY CXX_STANDARD 17)
-
--target_include_directories(metadata_thrift PRIVATE ${INCLUDE_DIRS})
++set_property(TARGET metadata_thrift PROPERTY POSITION_INDEPENDENT_CODE ON)
++set_property(TARGET metadata_thrift PROPERTY CXX_VISIBILITY_PRESET hidden)
++set_property(TARGET metadata_thrift PROPERTY VISIBILITY_INLINES_HIDDEN 1)
+ target_include_directories(metadata_thrift PRIVATE ${INCLUDE_DIRS})
-
-add_dependencies(metadata_thrift thrift_light)
--
++target_link_libraries(metadata_thrift fmt glog folly)
+
foreach(tgt dwarfs ${BINARY_TARGETS})
target_include_directories(
${tgt} SYSTEM
-@@ -501,8 +402,6 @@
- set_property(TARGET ${tgt} PROPERTY CXX_STANDARD_REQUIRED ON)
- set_property(TARGET ${tgt} PROPERTY CXX_EXTENSIONS OFF)
+ PRIVATE ${Boost_INCLUDE_DIRS} ${Python3_INCLUDE_DIRS} ${INCLUDE_DIRS}
+- ${CMAKE_CURRENT_SOURCE_DIR}/parallel-hashmap)
++ )
-- add_dependencies(${tgt} metadata_thrift)
--
- if(ENABLE_ASAN)
- target_compile_options(${tgt} PRIVATE -fsanitize=address
- -fno-omit-frame-pointer)
-@@ -535,25 +434,8 @@
+ target_include_directories(${tgt} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include)
+
+@@ -565,23 +512,11 @@
endif()
endforeach()
@@ -156,18 +140,18 @@
-
target_link_libraries(
dwarfs
-- metadata_thrift
++ thriftprotocol
++ thriftfrozen2
+ metadata_thrift
- thrift_light
-- folly
-- fsst
+ folly
+ fsst
${Boost_LIBRARIES}
- PkgConfig::LIBARCHIVE
- PkgConfig::LIBLZ4
-@@ -582,11 +464,6 @@
+@@ -612,11 +547,6 @@
if(USE_JEMALLOC)
target_link_libraries(${tgt} ${Jemalloc_LIBRARIES})
endif()
-- if(TARGET folly_exception_tracer)
+- if(DWARFS_USE_EXCEPTION_TRACER)
- target_link_libraries(
- ${tgt} -Wl,--whole-archive folly_exception_tracer_base
- folly_exception_tracer -Wl,--no-whole-archive)
diff --git a/sys-fs/dwarfs/files/unbundle-folly-fbthrift.patch b/sys-fs/dwarfs/files/unbundle-folly-fbthrift.patch
deleted file mode 100644
index 853ebe046..000000000
--- a/sys-fs/dwarfs/files/unbundle-folly-fbthrift.patch
+++ /dev/null
@@ -1,153 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -298,7 +298,7 @@
- if(WITH_TESTS OR WITH_BENCHMARKS)
- add_library(test_helpers test/test_helpers.cpp test/test_strings.cpp
- test/loremipsum.cpp)
-- target_link_libraries(test_helpers dwarfs folly)
-+ target_link_libraries(test_helpers dwarfs)
- set_property(TARGET test_helpers PROPERTY CXX_STANDARD 17)
- endif()
-
-@@ -364,70 +364,7 @@
-
- list(
- APPEND
-- FROZEN_THRIFT_SRC
-- ${CMAKE_CURRENT_BINARY_DIR}/thrift/lib/thrift/gen-cpp2/frozen_data.h
-- ${CMAKE_CURRENT_BINARY_DIR}/thrift/lib/thrift/gen-cpp2/frozen_data.cpp
-- ${CMAKE_CURRENT_BINARY_DIR}/thrift/lib/thrift/gen-cpp2/frozen_types.h
-- ${CMAKE_CURRENT_BINARY_DIR}/thrift/lib/thrift/gen-cpp2/frozen_types.tcc
-- ${CMAKE_CURRENT_BINARY_DIR}/thrift/lib/thrift/gen-cpp2/frozen_types.cpp
-- ${CMAKE_CURRENT_BINARY_DIR}/thrift/lib/thrift/gen-cpp2/frozen_types_custom_protocol.h
-- ${CMAKE_CURRENT_BINARY_DIR}/thrift/lib/thrift/gen-cpp2/frozen_constants.h
-- ${CMAKE_CURRENT_BINARY_DIR}/thrift/lib/thrift/gen-cpp2/frozen_constants.cpp
-- ${CMAKE_CURRENT_BINARY_DIR}/thrift/lib/thrift/gen-cpp2/frozen_metadata.h
-- ${CMAKE_CURRENT_BINARY_DIR}/thrift/lib/thrift/gen-cpp2/frozen_metadata.cpp
-- ${CMAKE_CURRENT_BINARY_DIR}/thrift/lib/thrift/gen-cpp2/frozen_visitation.h
-- ${CMAKE_CURRENT_BINARY_DIR}/thrift/lib/thrift/gen-cpp2/frozen_for_each_field.h
-- ${CMAKE_CURRENT_BINARY_DIR}/thrift/lib/thrift/gen-cpp2/frozen_visit_union.h)
--
--list(
-- APPEND
-- METADATA_THRIFT_SRC
-- ${CMAKE_CURRENT_BINARY_DIR}/thrift/dwarfs/gen-cpp2/metadata_constants.cpp
-- ${CMAKE_CURRENT_BINARY_DIR}/thrift/dwarfs/gen-cpp2/metadata_constants.h
-- ${CMAKE_CURRENT_BINARY_DIR}/thrift/dwarfs/gen-cpp2/metadata_data.cpp
-- ${CMAKE_CURRENT_BINARY_DIR}/thrift/dwarfs/gen-cpp2/metadata_data.h
-- ${CMAKE_CURRENT_BINARY_DIR}/thrift/dwarfs/gen-cpp2/metadata_for_each_field.h
-- ${CMAKE_CURRENT_BINARY_DIR}/thrift/dwarfs/gen-cpp2/metadata_layouts.cpp
-- ${CMAKE_CURRENT_BINARY_DIR}/thrift/dwarfs/gen-cpp2/metadata_layouts.h
-- ${CMAKE_CURRENT_BINARY_DIR}/thrift/dwarfs/gen-cpp2/metadata_metadata.cpp
-- ${CMAKE_CURRENT_BINARY_DIR}/thrift/dwarfs/gen-cpp2/metadata_metadata.h
-- ${CMAKE_CURRENT_BINARY_DIR}/thrift/dwarfs/gen-cpp2/metadata_types.cpp
-- ${CMAKE_CURRENT_BINARY_DIR}/thrift/dwarfs/gen-cpp2/metadata_types.h
-- ${CMAKE_CURRENT_BINARY_DIR}/thrift/dwarfs/gen-cpp2/metadata_types.tcc
-- ${CMAKE_CURRENT_BINARY_DIR}/thrift/dwarfs/gen-cpp2/metadata_types_custom_protocol.h
-- ${CMAKE_CURRENT_BINARY_DIR}/thrift/dwarfs/gen-cpp2/metadata_visit_union.h
-- ${CMAKE_CURRENT_BINARY_DIR}/thrift/dwarfs/gen-cpp2/metadata_visitation.h)
--
--add_custom_command(
-- OUTPUT ${FROZEN_THRIFT_SRC}
-- COMMAND mkdir -p ${CMAKE_CURRENT_BINARY_DIR}/thrift/lib/thrift
-- COMMAND
-- cp ${CMAKE_CURRENT_SOURCE_DIR}/fbthrift/thrift/lib/thrift/frozen.thrift
-- ${CMAKE_CURRENT_BINARY_DIR}/thrift/lib/thrift/
-- COMMAND cd ${CMAKE_CURRENT_BINARY_DIR}/thrift/lib/thrift &&
-- ${CMAKE_CURRENT_BINARY_DIR}/bin/thrift1 --gen mstch_cpp2 frozen.thrift
-- DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/bin/thrift1
-- ${CMAKE_CURRENT_SOURCE_DIR}/fbthrift/thrift/lib/thrift/frozen.thrift)
--
--add_custom_command(
-- OUTPUT ${METADATA_THRIFT_SRC}
-- COMMAND mkdir -p ${CMAKE_CURRENT_BINARY_DIR}/thrift/dwarfs
-- COMMAND cp ${CMAKE_CURRENT_SOURCE_DIR}/thrift/metadata.thrift
-- thrift/dwarfs/metadata.thrift
-- COMMAND
-- cd ${CMAKE_CURRENT_BINARY_DIR}/thrift/dwarfs &&
-- ${CMAKE_CURRENT_BINARY_DIR}/bin/thrift1 --gen mstch_cpp2:frozen2
-- metadata.thrift
-- DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/bin/thrift1
-- ${CMAKE_CURRENT_SOURCE_DIR}/thrift/metadata.thrift)
--
--list(
-- APPEND
- INCLUDE_DIRS
-- ${CMAKE_CURRENT_BINARY_DIR}/folly
-- ${CMAKE_CURRENT_BINARY_DIR}/thrift
-- ${CMAKE_CURRENT_SOURCE_DIR}/folly
-- ${CMAKE_CURRENT_SOURCE_DIR}/fbthrift
- ${CMAKE_CURRENT_BINARY_DIR})
-
- if(NOT (ZSTD_FOUND AND PREFER_SYSTEM_ZSTD))
-@@ -445,39 +382,6 @@
- list(APPEND INCLUDE_DIRS ${Jemalloc_INCLUDE_DIRS})
- endif()
-
--add_library(
-- thrift_light
-- ${CMAKE_CURRENT_SOURCE_DIR}/fbthrift/thrift/lib/cpp2/FieldRef.cpp
-- ${CMAKE_CURRENT_SOURCE_DIR}/fbthrift/thrift/lib/cpp2/protocol/CompactProtocol.cpp
-- ${CMAKE_CURRENT_SOURCE_DIR}/fbthrift/thrift/lib/cpp2/protocol/BinaryProtocol.cpp
-- ${CMAKE_CURRENT_SOURCE_DIR}/fbthrift/thrift/lib/cpp2/protocol/DebugProtocol.cpp
-- ${CMAKE_CURRENT_SOURCE_DIR}/fbthrift/thrift/lib/cpp2/protocol/JSONProtocolCommon.cpp
-- ${CMAKE_CURRENT_SOURCE_DIR}/fbthrift/thrift/lib/cpp2/protocol/JSONProtocol.cpp
-- ${CMAKE_CURRENT_SOURCE_DIR}/fbthrift/thrift/lib/cpp/protocol/TProtocolException.cpp
-- ${CMAKE_CURRENT_SOURCE_DIR}/fbthrift/thrift/lib/cpp/util/VarintUtils.cpp
-- ${CMAKE_CURRENT_SOURCE_DIR}/fbthrift/thrift/lib/cpp2/gen/module_types_cpp.cpp
-- ${CMAKE_CURRENT_SOURCE_DIR}/fbthrift/thrift/lib/cpp2/frozen/Frozen.cpp
-- ${CMAKE_CURRENT_SOURCE_DIR}/fbthrift/thrift/lib/cpp2/frozen/FrozenUtil.cpp
-- ${CMAKE_CURRENT_SOURCE_DIR}/fbthrift/thrift/lib/cpp2/frozen/schema/MemorySchema.cpp
-- ${CMAKE_CURRENT_BINARY_DIR}/thrift/lib/thrift/gen-cpp2/frozen_data.cpp
-- ${CMAKE_CURRENT_BINARY_DIR}/thrift/lib/thrift/gen-cpp2/frozen_types.cpp)
--
--set_property(TARGET thrift_light PROPERTY CXX_STANDARD 17)
--
--target_include_directories(thrift_light PRIVATE ${INCLUDE_DIRS})
--
--add_library(
-- metadata_thrift
-- ${CMAKE_CURRENT_BINARY_DIR}/thrift/dwarfs/gen-cpp2/metadata_layouts.cpp
-- ${CMAKE_CURRENT_BINARY_DIR}/thrift/dwarfs/gen-cpp2/metadata_types.cpp
-- ${CMAKE_CURRENT_BINARY_DIR}/thrift/dwarfs/gen-cpp2/metadata_data.cpp)
--
--set_property(TARGET metadata_thrift PROPERTY CXX_STANDARD 17)
--
--target_include_directories(metadata_thrift PRIVATE ${INCLUDE_DIRS})
--
--add_dependencies(metadata_thrift thrift_light)
--
- foreach(tgt dwarfs ${BINARY_TARGETS})
- target_include_directories(
- ${tgt} SYSTEM
-@@ -501,8 +405,6 @@
- set_property(TARGET ${tgt} PROPERTY CXX_STANDARD_REQUIRED ON)
- set_property(TARGET ${tgt} PROPERTY CXX_EXTENSIONS OFF)
-
-- add_dependencies(${tgt} metadata_thrift)
--
- if(ENABLE_ASAN)
- target_compile_options(${tgt} PRIVATE -fsanitize=address
- -fno-omit-frame-pointer)
-@@ -550,9 +452,6 @@
-
- target_link_libraries(
- dwarfs
-- metadata_thrift
-- thrift_light
-- folly
- fsst
- ${Boost_LIBRARIES}
- PkgConfig::LIBARCHIVE
-@@ -582,11 +481,6 @@
- if(USE_JEMALLOC)
- target_link_libraries(${tgt} ${Jemalloc_LIBRARIES})
- endif()
-- if(TARGET folly_exception_tracer)
-- target_link_libraries(
-- ${tgt} -Wl,--whole-archive folly_exception_tracer_base
-- folly_exception_tracer -Wl,--no-whole-archive)
-- endif()
- endforeach()
-
- if(STATIC_BUILD_DO_NOT_USE)
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: sys-fs/dwarfs/, sys-fs/dwarfs/files/
@ 2021-11-26 11:16 Denis Reva
0 siblings, 0 replies; 5+ messages in thread
From: Denis Reva @ 2021-11-26 11:16 UTC (permalink / raw
To: gentoo-commits
commit: 0140c669bd635739ae4ca86e2daf2ecf6a866fba
Author: Denis Reva <denis7774 <AT> gmail <DOT> com>
AuthorDate: Fri Nov 26 11:16:26 2021 +0000
Commit: Denis Reva <denis7774 <AT> gmail <DOT> com>
CommitDate: Fri Nov 26 11:16:26 2021 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=0140c669
sys-fs/dwarfs: fixed build with boost 1.77.0-r3
See https://github.com/mhx/dwarfs/issues/57
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Denis Reva <denis7774 <AT> gmail.com>
sys-fs/dwarfs/dwarfs-0.5.6-r3.ebuild | 100 +++++++++++++++++++++++++++
sys-fs/dwarfs/files/dwarfs-0.5.6-mutex.patch | 12 ++++
2 files changed, 112 insertions(+)
diff --git a/sys-fs/dwarfs/dwarfs-0.5.6-r3.ebuild b/sys-fs/dwarfs/dwarfs-0.5.6-r3.ebuild
new file mode 100644
index 000000000..6d806b775
--- /dev/null
+++ b/sys-fs/dwarfs/dwarfs-0.5.6-r3.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8,9} )
+
+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.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="python +jemalloc test"
+
+RDEPEND="
+ ${PYTHON_DEPS}
+ app-arch/libarchive
+ app-arch/lz4
+ app-arch/snappy
+ app-arch/xz-utils
+ app-arch/zstd
+ dev-cpp/fbthrift:=
+ >=dev-cpp/folly-2021.04.19.00-r1:=
+ dev-cpp/gflags
+ dev-cpp/glog[gflags]
+ dev-cpp/parallel-hashmap:=
+ dev-cpp/sparsehash
+ dev-libs/boost[context,threads(+),python?]
+ dev-libs/double-conversion
+ dev-libs/fsst:=
+ dev-libs/libevent
+ dev-libs/libfmt
+ dev-libs/xxhash
+ sys-fs/fuse:3
+ sys-libs/binutils-libs
+ sys-libs/libunwind
+ sys-libs/zlib
+
+ jemalloc? ( >=dev-libs/jemalloc-5.2.1 )
+"
+DEPEND="
+ ${RDEPEND}
+ sys-devel/flex
+"
+BDEPEND="
+ app-text/ronn
+ sys-devel/bison
+ virtual/pkgconfig
+
+ test? ( dev-cpp/gtest )
+"
+
+DOCS=( "README.md" "CHANGES.md" "TODO" )
+RESTRICT="!test? ( test )"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+PATCHES=( "${FILESDIR}/${P}-unbundle.patch" "${FILESDIR}/${P}-mutex.patch" )
+
+CHECKREQS_DISK_BUILD="1300M"
+CMAKE_IN_SOURCE_BUILD=1
+CMAKE_WARN_UNUSED_CLI=0
+
+src_prepare(){
+ rm -r fsst zstd fbthrift/* folly 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)
+ -DPREFER_SYSTEM_ZSTD=1
+ -DPREFER_SYSTEM_XXHASH=1
+ -DPREFER_SYSTEM_GTEST=1
+ -DWITH_LEGACY_FUSE=0
+ )
+ use python && mycmakeargs+=( "-DWITH_PYTHON_VERSION=${EPYTHON#python}" )
+ cmake_src_configure
+}
+
+src_install(){
+ cmake_src_install
+ dolib.so libdwarfs.so
+}
+
+pkg_postinst(){
+ elog "Suggest to enable USE 'threads' globally if you have multicore machine"
+ elog "Since version 0.4.1 GGC builds has been fixed. Now both Clang and GCC are working very well"
+ 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"
+}
diff --git a/sys-fs/dwarfs/files/dwarfs-0.5.6-mutex.patch b/sys-fs/dwarfs/files/dwarfs-0.5.6-mutex.patch
new file mode 100644
index 000000000..1a47150d3
--- /dev/null
+++ b/sys-fs/dwarfs/files/dwarfs-0.5.6-mutex.patch
@@ -0,0 +1,12 @@
+diff --git a/src/dwarfs/block_compressor.cpp b/src/dwarfs/block_compressor.cpp
+index 9cdcdb9..c2219c5 100644
+--- a/src/dwarfs/block_compressor.cpp
++++ b/src/dwarfs/block_compressor.cpp
+@@ -26,6 +26,7 @@
+ #include <cstring>
+ #include <iterator>
+ #include <memory>
++#include <mutex>
+ #include <unordered_map>
+
+ #include <sys/types.h>
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2021-11-26 11:16 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-04-28 21:21 [gentoo-commits] repo/proj/guru:dev commit in: sys-fs/dwarfs/, sys-fs/dwarfs/files/ Alessandro Barbieri
-- strict thread matches above, loose matches on Subject: below --
2021-11-26 11:16 Denis Reva
2021-10-28 15:18 Alessandro Barbieri
2021-05-02 1:51 Alessandro Barbieri
2021-03-15 9:06 Denis Reva
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox