[packages/firefox52-esr] - nicer variant of the patch

arekm arekm at pld-linux.org
Tue Mar 3 13:21:37 CET 2020


commit 1c16d59b033805c674c258eed2878b2a727b648a
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Tue Mar 3 13:21:30 2020 +0100

    - nicer variant of the patch

 glibc.patch | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)
---
diff --git a/glibc.patch b/glibc.patch
index baf455c..5c331b7 100644
--- a/glibc.patch
+++ b/glibc.patch
@@ -1,16 +1,18 @@
---- firefox-52.9.0esr/tools/profiler/core/platform.h~	2017-04-11 04:13:25.000000000 +0200
-+++ firefox-52.9.0esr/tools/profiler/core/platform.h	2020-03-03 11:59:12.442453550 +0100
-@@ -63,13 +63,6 @@
+--- firefox-52.9.0esr/tools/profiler/core/platform.h~	2020-03-03 13:20:04.000000000 +0100
++++ firefox-52.9.0esr/tools/profiler/core/platform.h	2020-03-03 13:20:47.438599518 +0100
+@@ -63,6 +63,7 @@
  // provide a wrapper for it (except for Bionic)
  #if defined(__linux__)
  #include <unistd.h>
--#if !defined(__BIONIC__)
--#include <sys/syscall.h>
--static inline pid_t gettid()
--{
--  return (pid_t) syscall(SYS_gettid);
--}
--#endif
++#if !__GLIBC_PREREQ(2, 30)
+ #if !defined(__BIONIC__)
+ #include <sys/syscall.h>
+ static inline pid_t gettid()
+@@ -71,6 +72,7 @@ static inline pid_t gettid()
+ }
  #endif
+ #endif
++#endif
  
  #ifdef XP_WIN
+ #include <windows.h>
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/firefox52-esr.git/commitdiff/1c16d59b033805c674c258eed2878b2a727b648a



More information about the pld-cvs-commit mailing list