sys-libs/tdb: Sync with Gentoo

It's from Gentoo commit e59bcda0257406a0510c5a4c94e9479078b864b3.
This commit is contained in:
krishjainx 2023-07-05 14:05:59 +02:00 committed by Krzesimir Nowak
parent d62b52a080
commit 8830356999
4 changed files with 76 additions and 25 deletions

View File

@ -1,2 +1,2 @@
DIST tdb-1.4.5.tar.gz 729650 BLAKE2B 5d8a226cf251268d70f68759fb792628559fa3b10e7843d1a53914ea24f0ceca61fe0c3f348d704ebc8df4c56fe2365690b585b1c96cf53d63ecae1960aca58a SHA512 373b2ce5b2c68fbc28b7679f0e7531115b91ddc6a68b27acada39b995f66b508b19f24d712fc4388654199abd69857e53ebd435d1ed47e3a69ba85ff667fed56 DIST tdb-1.4.7.tar.gz 741714 BLAKE2B ec2f991bbaa61d46f16b7a68a4e47a2f690cda261dd0e9fd9708e51ad64eefeb54ac8b1102cde6935916f840d3c89d7a2903f58175cceb78ea4ef889e82ddbc6 SHA512 2b5b20c299b60545943f106d854b6e0d4a559e16f08a7ed62fe57ee962bebc888c2e663bd5fef907aace05b316826fe8fbbf3f323b6d3427531e59ffe47d48e4
DIST tdb-1.4.6.tar.gz 736747 BLAKE2B 53b989955993e970f3ca0874ade4d7404e180fedaac94d409753b209ea9dfa5136f2cdce4eb6d67a44b208731466eb0557c4dfcd9db20ea5806c5da1a3917e50 SHA512 8af549867fdf2e0daf073c26933ae0d475ea64efaca23d3d7b0eb20839376e817f4c0a0ba2504f60f9e27a2b35d3b6ae7c329d88a5c2c0408e98ad9dfde84712 DIST tdb-1.4.8.tar.gz 742791 BLAKE2B dc2705cb16ee59f4d5bf25602032b25fd5338caa890db19939996a40cd19c4c999f9a74786d5754dbbd1de54d818541cf56844beeb33008aaee507d5dfcdba85 SHA512 763beebe923aa04303cbb91ce5970e6bbd13546888cff75ea9ab025afff3ef88fee539ae173fc2fb7ec661b6c337b0c2da361ce3d318f51ef6627bdb3fe6ca63

View File

@ -0,0 +1,26 @@
https://bugs.gentoo.org/870043
https://gitlab.com/samba-team/samba/-/merge_requests/2807
https://src.fedoraproject.org/rpms/libtdb/blob/rawhide/f/libtdb-waf18-c99.patch
Avoid calling lib_func without a prototype.
This commit mirrors the change in commit f4c0a750d4adebcf2342a44e85f04526c34
("WAF: Fix detection of linker features")
to buildtools/wafsamba/samba_conftests.py. It fixes the check for rpath
support with compilers in strict C99 mode.
Submitted upstream: <https://gitlab.com/samba-team/samba/-/merge_requests/2807>
--- a/buildtools/wafsamba/samba_waf18.py
+++ b/buildtools/wafsamba/samba_waf18.py
@@ -209,7 +209,8 @@ def CHECK_LIBRARY_SUPPORT(conf, rpath=False, version_script=False, msg=None):
lib_node.parent.mkdir()
lib_node.write('int lib_func(void) { return 42; }\n', 'w')
main_node = bld.srcnode.make_node('main.c')
- main_node.write('int main(void) {return !(lib_func() == 42);}', 'w')
+ main_node.write('int lib_func(void);\n'
+ 'int main(void) {return !(lib_func() == 42);}', 'w')
linkflags = []
if version_script:
script = bld.srcnode.make_node('ldscript')

View File

@ -1,9 +1,9 @@
# Copyright 1999-2022 Gentoo Authors # Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
EAPI=7 EAPI=8
PYTHON_COMPAT=( python3_{8..10} ) PYTHON_COMPAT=( python3_{9..11} )
PYTHON_REQ_USE="threads(+)" PYTHON_REQ_USE="threads(+)"
inherit waf-utils multilib-minimal python-single-r1 inherit waf-utils multilib-minimal python-single-r1
@ -13,21 +13,35 @@ SRC_URI="https://samba.org/ftp/tdb/${P}.tar.gz"
LICENSE="GPL-3" LICENSE="GPL-3"
SLOT="0" SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
IUSE="python" IUSE="python"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" REQUIRED_USE="${PYTHON_REQUIRED_USE}"
RESTRICT="test" RESTRICT="test"
RDEPEND=" RDEPEND="
dev-libs/libbsd[${MULTILIB_USEDEP}] dev-libs/libbsd[${MULTILIB_USEDEP}]
python? ( ${PYTHON_DEPS} )" python? ( ${PYTHON_DEPS} )
DEPEND="${RDEPEND} "
virtual/libcrypt" DEPEND="
BDEPEND="${PYTHON_DEPS} ${RDEPEND}
app-text/docbook-xml-dtd:4.2" virtual/libcrypt
"
BDEPEND="
${PYTHON_DEPS}
app-text/docbook-xml-dtd:4.2
"
WAF_BINARY="${S}/buildtools/bin/waf" WAF_BINARY="${S}/buildtools/bin/waf"
PATCHES=(
"${FILESDIR}"/${PN}-1.4.7-configure-clang16.patch
)
pkg_setup() {
python-single-r1_pkg_setup
export PYTHONHASHSEED=1
}
src_prepare() { src_prepare() {
default default
python_fix_shebang . python_fix_shebang .

View File

@ -1,9 +1,9 @@
# Copyright 1999-2022 Gentoo Authors # Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
EAPI=7 EAPI=8
PYTHON_COMPAT=( python3_{8..10} ) PYTHON_COMPAT=( python3_{9..11} )
PYTHON_REQ_USE="threads(+)" PYTHON_REQ_USE="threads(+)"
inherit waf-utils multilib-minimal python-single-r1 inherit waf-utils multilib-minimal python-single-r1
@ -13,18 +13,23 @@ SRC_URI="https://samba.org/ftp/tdb/${P}.tar.gz"
LICENSE="GPL-3" LICENSE="GPL-3"
SLOT="0" SLOT="0"
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
IUSE="python" IUSE="python"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" REQUIRED_USE="${PYTHON_REQUIRED_USE}"
RESTRICT="test" RESTRICT="test"
RDEPEND=" RDEPEND="
dev-libs/libbsd[${MULTILIB_USEDEP}] dev-libs/libbsd[${MULTILIB_USEDEP}]
python? ( ${PYTHON_DEPS} )" python? ( ${PYTHON_DEPS} )
DEPEND="${RDEPEND} "
virtual/libcrypt" DEPEND="
BDEPEND="${PYTHON_DEPS} ${RDEPEND}
app-text/docbook-xml-dtd:4.2" virtual/libcrypt
"
BDEPEND="
${PYTHON_DEPS}
app-text/docbook-xml-dtd:4.2
"
WAF_BINARY="${S}/buildtools/bin/waf" WAF_BINARY="${S}/buildtools/bin/waf"
@ -35,7 +40,14 @@ src_prepare() {
} }
multilib_src_configure() { multilib_src_configure() {
local extra_opts=() MAKEOPTS+=" -j1"
local extra_opts=(
--libdir="${EPREFIX}/usr/$(get_libdir)"
--disable-dependency-tracking
--disable-warnings-as-errors
)
if ! multilib_is_native_abi || ! use python ; then if ! multilib_is_native_abi || ! use python ; then
extra_opts+=( --disable-python ) extra_opts+=( --disable-python )
fi fi
@ -44,8 +56,6 @@ multilib_src_configure() {
} }
multilib_src_compile() { multilib_src_compile() {
# need to avoid parallel building, this looks like the sanest way with waf-utils/multiprocessing eclasses
unset MAKEOPTS
waf-utils_src_compile waf-utils_src_compile
} }
@ -57,4 +67,5 @@ multilib_src_test() {
multilib_src_install() { multilib_src_install() {
waf-utils_src_install waf-utils_src_install
use python && python_optimize
} }