diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/tdb/Manifest b/sdk_container/src/third_party/portage-stable/sys-libs/tdb/Manifest index e452caa9ba..7ff18268d2 100644 --- a/sdk_container/src/third_party/portage-stable/sys-libs/tdb/Manifest +++ b/sdk_container/src/third_party/portage-stable/sys-libs/tdb/Manifest @@ -1,3 +1,3 @@ -DIST tdb-1.4.7.tar.gz 741714 BLAKE2B ec2f991bbaa61d46f16b7a68a4e47a2f690cda261dd0e9fd9708e51ad64eefeb54ac8b1102cde6935916f840d3c89d7a2903f58175cceb78ea4ef889e82ddbc6 SHA512 2b5b20c299b60545943f106d854b6e0d4a559e16f08a7ed62fe57ee962bebc888c2e663bd5fef907aace05b316826fe8fbbf3f323b6d3427531e59ffe47d48e4 +DIST tdb-1.4.10.tar.gz 747139 BLAKE2B e271f824acc8c691a6e88f5e5f73d0673a132134d025e84461520108b94cd7a5db587a0012ad1172270d29042f29336aab6ca59a735d611d6529f81ec3c195e9 SHA512 b5147d811617d90a025d1070abf16c42744b3fc3cac1042fbff03b1e635af2eaf9c957a7bffdb3f56b4a0c775b44f8027def9f23deb1b3ede817b95bbece2ce9 DIST tdb-1.4.8.tar.gz 742791 BLAKE2B dc2705cb16ee59f4d5bf25602032b25fd5338caa890db19939996a40cd19c4c999f9a74786d5754dbbd1de54d818541cf56844beeb33008aaee507d5dfcdba85 SHA512 763beebe923aa04303cbb91ce5970e6bbd13546888cff75ea9ab025afff3ef88fee539ae173fc2fb7ec661b6c337b0c2da361ce3d318f51ef6627bdb3fe6ca63 DIST tdb-1.4.9.tar.gz 746608 BLAKE2B 2cdcf636b9ef5445d48ca2aab79d4ffd137a8409b6d7b1fcdbcd28797d4bbe617f768a5ef92a14c4ae6dddfc37576f5d411cf4d67edeb4319f46a1a15ffd94ee SHA512 6b0109075826b8630f6b5a7e7ade2fcff95c5d05338340af78219422610947c520707b3e484ff13fbd40bbfffe13977976e8ddcb1be7b13e13ac78b4e3ec06c2 diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/tdb/files/tdb-1.4.7-configure-clang16.patch b/sdk_container/src/third_party/portage-stable/sys-libs/tdb/files/tdb-1.4.7-configure-clang16.patch deleted file mode 100644 index 9d3e485da5..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-libs/tdb/files/tdb-1.4.7-configure-clang16.patch +++ /dev/null @@ -1,26 +0,0 @@ -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: - ---- 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') - diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/tdb/tdb-1.4.7-r1.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/tdb/tdb-1.4.10.ebuild similarity index 67% rename from sdk_container/src/third_party/portage-stable/sys-libs/tdb/tdb-1.4.7-r1.ebuild rename to sdk_container/src/third_party/portage-stable/sys-libs/tdb/tdb-1.4.10.ebuild index 55c2e98449..aaa8bb18ce 100644 --- a/sdk_container/src/third_party/portage-stable/sys-libs/tdb/tdb-1.4.7-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-libs/tdb/tdb-1.4.10.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..12} ) PYTHON_REQ_USE="threads(+)" inherit waf-utils multilib-minimal python-single-r1 @@ -13,10 +13,11 @@ SRC_URI="https://samba.org/ftp/tdb/${P}.tar.gz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" -IUSE="python" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" +IUSE="python test" + REQUIRED_USE="${PYTHON_REQUIRED_USE}" -RESTRICT="test" +RESTRICT="!test? ( test )" RDEPEND=" dev-libs/libbsd[${MULTILIB_USEDEP}] @@ -33,23 +34,28 @@ BDEPEND=" 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() { default + python_fix_shebang . + + if use test ; then + # TODO: Fix python tests to run w/ USE=python. + truncate -s0 python/tests/simple.py || die + fi + multilib_copy_sources } 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 extra_opts+=( --disable-python ) fi @@ -58,8 +64,6 @@ multilib_src_configure() { } 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 } diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/tdb/tdb-1.4.8.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/tdb/tdb-1.4.8.ebuild index 367f845e97..7215d9d77b 100644 --- a/sdk_container/src/third_party/portage-stable/sys-libs/tdb/tdb-1.4.8.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-libs/tdb/tdb-1.4.8.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{9..12} ) PYTHON_REQ_USE="threads(+)" inherit waf-utils multilib-minimal python-single-r1 diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/tdb/tdb-1.4.9.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/tdb/tdb-1.4.9.ebuild index 5b6c8e1e54..aaa8bb18ce 100644 --- a/sdk_container/src/third_party/portage-stable/sys-libs/tdb/tdb-1.4.9.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-libs/tdb/tdb-1.4.9.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{10..11} ) +PYTHON_COMPAT=( python3_{10..12} ) PYTHON_REQ_USE="threads(+)" inherit waf-utils multilib-minimal python-single-r1