mirror of
https://github.com/gentoo-mirror/guru.git
synced 2026-07-23 05:53:12 -04:00
net-im/tuwunel: Remove system-rocksdb USE-flag
Signed-off-by: Niklaus 'vimja' Hofer <gentoo-bugzilla@vimja.email>
This commit is contained in:
@@ -8,7 +8,4 @@
|
|||||||
<upstream>
|
<upstream>
|
||||||
<remote-id type="github">matrix-construct/tuwunel</remote-id>
|
<remote-id type="github">matrix-construct/tuwunel</remote-id>
|
||||||
</upstream>
|
</upstream>
|
||||||
<use>
|
|
||||||
<flag name="system-rocksdb">Use <pkg>dev-libs/rocksdb</pkg> instead of vendored version.</flag>
|
|
||||||
</use>
|
|
||||||
</pkgmetadata>
|
</pkgmetadata>
|
||||||
|
|||||||
@@ -68,7 +68,7 @@ LICENSE+="
|
|||||||
"
|
"
|
||||||
SLOT="0"
|
SLOT="0"
|
||||||
KEYWORDS="~amd64 ~arm64"
|
KEYWORDS="~amd64 ~arm64"
|
||||||
IUSE="jemalloc system-rocksdb gzip zstd lz4 bzip2 systemd brotli ldap io-uring"
|
IUSE="jemalloc gzip zstd lz4 bzip2 systemd brotli ldap io-uring"
|
||||||
|
|
||||||
# bzip2 looks difficult to un-bundle:
|
# bzip2 looks difficult to un-bundle:
|
||||||
# https://wiki.gentoo.org/wiki/Project:Rust/sys_crates#bzip2-sys
|
# https://wiki.gentoo.org/wiki/Project:Rust/sys_crates#bzip2-sys
|
||||||
@@ -80,9 +80,6 @@ COMMON_DEPEND="
|
|||||||
zstd? (
|
zstd? (
|
||||||
app-arch/zstd:=
|
app-arch/zstd:=
|
||||||
)
|
)
|
||||||
system-rocksdb? (
|
|
||||||
dev-libs/rocksdb
|
|
||||||
)
|
|
||||||
"
|
"
|
||||||
RDEPEND="
|
RDEPEND="
|
||||||
${COMMON_DEPEND}
|
${COMMON_DEPEND}
|
||||||
@@ -173,12 +170,8 @@ src_configure() {
|
|||||||
export ZSTD_SYS_USE_PKG_CONFIG=1
|
export ZSTD_SYS_USE_PKG_CONFIG=1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if use system-rocksdb; then
|
# The project maintains their own fork of rocksdb. Because of that,
|
||||||
# https://wiki.gentoo.org/wiki/Writing_Rust_ebuilds#Common_-sys_crates
|
# unbundling it is not an option at this point.
|
||||||
export SNAPPY_LIB_DIR="${ESYSROOT}/usr/$(get_libdir)"
|
|
||||||
export ROCKSDB_INCLUDE_DIR="${ESYSROOT}/usr/include"
|
|
||||||
export ROCKSDB_LIB_DIR="${ESYSROOT}/usr/$(get_libdir)"
|
|
||||||
fi
|
|
||||||
|
|
||||||
local myfeatures=(
|
local myfeatures=(
|
||||||
element_hacks
|
element_hacks
|
||||||
|
|||||||
@@ -70,7 +70,7 @@ LICENSE+="
|
|||||||
"
|
"
|
||||||
SLOT="0"
|
SLOT="0"
|
||||||
KEYWORDS="~amd64 ~arm64"
|
KEYWORDS="~amd64 ~arm64"
|
||||||
IUSE="jemalloc system-rocksdb gzip zstd lz4 bzip2 systemd brotli ldap io-uring"
|
IUSE="jemalloc gzip zstd lz4 bzip2 systemd brotli ldap io-uring"
|
||||||
|
|
||||||
# bzip2 looks difficult to un-bundle:
|
# bzip2 looks difficult to un-bundle:
|
||||||
# https://wiki.gentoo.org/wiki/Project:Rust/sys_crates#bzip2-sys
|
# https://wiki.gentoo.org/wiki/Project:Rust/sys_crates#bzip2-sys
|
||||||
@@ -82,9 +82,6 @@ COMMON_DEPEND="
|
|||||||
zstd? (
|
zstd? (
|
||||||
app-arch/zstd:=
|
app-arch/zstd:=
|
||||||
)
|
)
|
||||||
system-rocksdb? (
|
|
||||||
dev-libs/rocksdb
|
|
||||||
)
|
|
||||||
"
|
"
|
||||||
RDEPEND="
|
RDEPEND="
|
||||||
${COMMON_DEPEND}
|
${COMMON_DEPEND}
|
||||||
@@ -175,12 +172,8 @@ src_configure() {
|
|||||||
export ZSTD_SYS_USE_PKG_CONFIG=1
|
export ZSTD_SYS_USE_PKG_CONFIG=1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if use system-rocksdb; then
|
# The project maintains their own fork of rocksdb. Because of that,
|
||||||
# https://wiki.gentoo.org/wiki/Writing_Rust_ebuilds#Common_-sys_crates
|
# unbundling it is not an option at this point.
|
||||||
export SNAPPY_LIB_DIR="${ESYSROOT}/usr/$(get_libdir)"
|
|
||||||
export ROCKSDB_INCLUDE_DIR="${ESYSROOT}/usr/include"
|
|
||||||
export ROCKSDB_LIB_DIR="${ESYSROOT}/usr/$(get_libdir)"
|
|
||||||
fi
|
|
||||||
|
|
||||||
local myfeatures=(
|
local myfeatures=(
|
||||||
element_hacks
|
element_hacks
|
||||||
|
|||||||
Reference in New Issue
Block a user