- added gettid patch (fix build with glibc 2.30+)

diff --git a/rpm-gettid.patch b/rpm-gettid.patch
new file mode 100644 (file)
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?)]),[

diff --git a/rpm.spec b/rpm.spec
index cce8d33228447d7175268b1457f60b11117a2d8b..f526ceff3d9a1ab55721f97ddf8052e48ed25a9a 100644 (file)
--- 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