fix build with glibc 2.30 (now defines gettid)

diff --git a/firefox60-esr.spec b/firefox60-esr.spec
index 7c94c4544f9f5a0cced0cf4c77cf5e988b92ede7..009de8bcb0d30dcfa7770231a4a5b53d67e3b08d 100644 (file)
--- a/firefox60-esr.spec
+++ b/firefox60-esr.spec
@@ -255,6 +255,7 @@ Source197:  http://releases.mozilla.org/pub/firefox/releases/%{lang_version}esr/l
 
 Patch0:                rust-1.33.patch
 Patch1:                %{origname}-libvpx1.7.patch
+Patch2:                glibc-2.30.patch
 Patch4:                %{origname}-prefs.patch
 Patch5:                %{origname}-pld-bookmarks.patch
 Patch6:                %{origname}-no-subshell.patch
@@ -2072,6 +2073,7 @@ unpack() {
 
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 %patch4 -p1
 %patch5 -p1
 %patch6 -p2

diff --git a/glibc-2.30.patch b/glibc-2.30.patch
new file mode 100644 (file)
index 0000000..aea0bc4
--- /dev/null
+++ b/glibc-2.30.patch
@@ -0,0 +1,13 @@
+--- firefox-60.8.0/tools/profiler/core/platform.h.orig 2019-08-06 21:57:41.190763126 +0200
++++ firefox-60.8.0/tools/profiler/core/platform.h      2019-08-06 22:00:13.309983976 +0200
+@@ -46,8 +46,10 @@
+ // wrapper for it.
+ #if defined(__GLIBC__)
+ #include <unistd.h>
++#if !__GLIBC_PREREQ(2, 30)
+ #include <sys/syscall.h>
+ static inline pid_t gettid() { return (pid_t)syscall(SYS_gettid); }
++#endif
+ #elif defined(GP_OS_darwin)
+ #include <unistd.h>
+ #include <sys/syscall.h>