[packages/rpm/dev-5.4.17] - added gettid patch (fix build with glibc 2.30+)
qboosh
qboosh at pld-linux.org
Wed Feb 5 21:55:53 CET 2020
commit 41c8661fef635acdbccd8e73a04fcff10ba9db53
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Wed Feb 5 21:56:13 2020 +0100
- added gettid patch (fix build with glibc 2.30+)
rpm-gettid.patch | 23 +++++++++++++++++++++++
rpm.spec | 2 ++
2 files changed, 25 insertions(+)
---
diff --git a/rpm.spec b/rpm.spec
index 0d67784..0cb76e6 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -180,6 +180,7 @@ Patch92: fast_python_deps.patch
Patch93: python2_explicit.patch
Patch97: glibc.patch
Patch98: extension-based-compression-detection.patch
+Patch100: %{name}-gettid.patch
# Patches imported from Mandriva
@@ -956,6 +957,7 @@ cd -
%patch93 -p1
%patch97 -p1
%patch98 -p1
+%patch100 -p1
%patch1050 -p1
diff --git a/rpm-gettid.patch b/rpm-gettid.patch
new file mode 100644
index 0000000..304e32c
--- /dev/null
+++ b/rpm-gettid.patch
@@ -0,0 +1,23 @@
+--- rpm-5.4.17/rpmio/bson.c.orig 2016-05-07 17:56:27.000000000 +0200
++++ rpm-5.4.17/rpmio/bson.c 2020-02-05 21:07:41.212048107 +0100
+@@ -3755,7 +3755,7 @@
+ static bson_context_t gContextDefault;
+
+
+-#if defined(__linux__)
++#if defined(__linux__) && !defined(HAVE_GETTID)
+ static uint16_t
+ gettid (void)
+ {
+--- rpm-5.4.17/configure.ac.orig 2020-02-05 18:18:27.663721262 +0100
++++ rpm-5.4.17/configure.ac 2020-02-05 21:09:41.408063616 +0100
+@@ -1578,6 +1578,9 @@
+ time atoi atol getopt fclose fgetc fgets fopen fwrite dnl
+ ])
+
++dnl # for bson
++AC_CHECK_FUNCS([gettid])
++
+ dnl # check for getmntent and alternatives
+ AC_CHECK_FUNC(getmntent, AC_DEFINE(HAVE_GETMNTENT, 1, [Define if you have the getmntent() function]), [
+ AC_CHECK_FUNC(mntctl, AC_DEFINE(HAVE_MNTCTL, 1, [Define as 1 if you have mntctl() (only aix?)]),[
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/rpm.git/commitdiff/41c8661fef635acdbccd8e73a04fcff10ba9db53
More information about the pld-cvs-commit
mailing list