[packages/firefox60-esr] fix build with glibc 2.30 (now defines gettid)
atler
atler at pld-linux.org
Tue Aug 6 22:35:34 CEST 2019
commit ad8a2407ba3ef2a50f6175a1d515b1225434a04f
Author: Jan Palus <atler at pld-linux.org>
Date: Tue Aug 6 22:34:41 2019 +0200
fix build with glibc 2.30 (now defines gettid)
firefox60-esr.spec | 2 ++
glibc-2.30.patch | 13 +++++++++++++
2 files changed, 15 insertions(+)
---
diff --git a/firefox60-esr.spec b/firefox60-esr.spec
index 7c94c45..009de8b 100644
--- 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
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>
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/firefox60-esr.git/commitdiff/ad8a2407ba3ef2a50f6175a1d515b1225434a04f
More information about the pld-cvs-commit
mailing list