summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam James <sam@gentoo.org>2023-01-04 04:01:02 +0000
committerSam James <sam@gentoo.org>2023-01-04 04:31:58 +0000
commit910d028c7514d9547c1d6a716546eadc9707d86b (patch)
treec1b29a7a979ee149d20e0c98359f0775c16a0f07
parentapp-crypt/efitools: drop 1.9.2 (diff)
downloadgentoo-910d028c7514d9547c1d6a716546eadc9707d86b.tar.gz
gentoo-910d028c7514d9547c1d6a716546eadc9707d86b.tar.bz2
gentoo-910d028c7514d9547c1d6a716546eadc9707d86b.zip
sys-libs/tdb: fix runtime w/ clang 16
Closes: https://bugs.gentoo.org/870043 Signed-off-by: Sam James <sam@gentoo.org>
-rw-r--r--sys-libs/tdb/files/tdb-1.4.7-configure-clang16.patch26
-rw-r--r--sys-libs/tdb/tdb-1.4.7-r1.ebuild (renamed from sys-libs/tdb/tdb-1.4.7.ebuild)8
2 files changed, 32 insertions, 2 deletions
diff --git a/sys-libs/tdb/files/tdb-1.4.7-configure-clang16.patch b/sys-libs/tdb/files/tdb-1.4.7-configure-clang16.patch
new file mode 100644
index 000000000000..9d3e485da57c
--- /dev/null
+++ b/sys-libs/tdb/files/tdb-1.4.7-configure-clang16.patch
@@ -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')
+
diff --git a/sys-libs/tdb/tdb-1.4.7.ebuild b/sys-libs/tdb/tdb-1.4.7-r1.ebuild
index 395a57071e4e..791b32c1f197 100644
--- a/sys-libs/tdb/tdb-1.4.7.ebuild
+++ b/sys-libs/tdb/tdb-1.4.7-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
PYTHON_COMPAT=( python3_{8..10} )
PYTHON_REQ_USE="threads(+)"
@@ -28,6 +28,10 @@ BDEPEND="${PYTHON_DEPS}
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