Merge staging-next into staging

1 files changed, 19 insertions, 25 deletions

diff --git a/pkgs/development/interpreters/python/cpython/3.8/no-ldconfig.patch b/pkgs/development/interpreters/python/cpython/3.8/no-ldconfig.patch
index 41d3ab52345..a1f9d68eb16 100644
--- a/pkgs/development/interpreters/python/cpython/3.8/no-ldconfig.patch
+++ b/pkgs/development/interpreters/python/cpython/3.8/no-ldconfig.patch
@@ -1,19 +1,19 @@
-From 66f492d2eda94bd64db833839a325caf6ba0fed5 Mon Sep 17 00:00:00 2001
-From: Greg Roodt <greg@canva.com>
-Date: Wed, 9 Dec 2020 17:59:24 +1100
+From 597e73f2a4b2f0b508127931b36d5540d6941823 Mon Sep 17 00:00:00 2001
+From: Frederik Rietdijk <fridh@fridh.nl>
+Date: Mon, 28 Aug 2017 09:24:06 +0200
 Subject: [PATCH] Don't use ldconfig
 
 ---
- Lib/ctypes/util.py | 77 ++--------------------------------------------
- 1 file changed, 2 insertions(+), 75 deletions(-)
+ Lib/ctypes/util.py | 70 ++----------------------------------------------------
+ 1 file changed, 2 insertions(+), 68 deletions(-)
 
 diff --git a/Lib/ctypes/util.py b/Lib/ctypes/util.py
-index 0c2510e161..7fb98af308 100644
+index 5e8b31a854..7b45ce6c15 100644
 --- a/Lib/ctypes/util.py
 +++ b/Lib/ctypes/util.py
-@@ -100,53 +100,7 @@ elif os.name == "posix":
-             return thefile.read(4) == elf_header
-
+@@ -94,46 +94,7 @@ elif os.name == "posix":
+     import re, tempfile
+ 
      def _findLib_gcc(name):
 -        # Run GCC's linker with the -t (aka --trace) option and examine the
 -        # library name it prints out. The GCC command will fail because we
@@ -51,24 +51,17 @@ index 0c2510e161..7fb98af308 100644
 -                # Raised if the file was already removed, which is the normal
 -                # behaviour of GCC if linking fails
 -                pass
--        res = re.findall(expr, trace)
+-        res = re.search(expr, trace)
 -        if not res:
 -            return None
--
--        for file in res:
--            # Check if the given file is an elf file: gcc can report
--            # some files that are linker scripts and not actual
--            # shared objects. See bpo-41976 for more details
--            if not _is_elf(file):
--                continue
--            return os.fsdecode(file)
+-        return os.fsdecode(res.group(0))
 +        return None
-
-
+ 
+ 
      if sys.platform == "sunos5":
-@@ -268,34 +222,7 @@ elif os.name == "posix":
+@@ -255,34 +216,7 @@ elif os.name == "posix":
      else:
-
+ 
          def _findSoname_ldconfig(name):
 -            import struct
 -            if struct.calcsize('l') == 4:
@@ -99,8 +92,9 @@ index 0c2510e161..7fb98af308 100644
 -            except OSError:
 -                pass
 +            return None
-
+ 
          def _findLib_ld(name):
              # See issue #9998 for why this is needed
---
-2.24.3 (Apple Git-128)
+-- 
+2.15.0
+