49cb564d14
* par is kept at -Np0
```sh
git grep -l '^patch_args=-Np0' "srcpkgs/$1*/template" |
while read template; do
for p in ${template%/template}/patches/*; do
sed -i '
\,^[+-][+-][+-] /dev/null,b
/^[*-]\+ [0-9]\+\(,[0-9]\+\)\? [*-]\+$/b
s,^[*][*][*] ,&a/,
/^--- /{
s,\(^--- \)\(./\)*,\1a/,
s,[.-][Oo][Rr][Ii][Gg]\([ /]\),\1,
s/[.-][Oo][Rr][Ii][Gg]$//
s/[.]patched[.]\([^.]\)/.\1/
h
}
/^+++ -/{
g
s/^--- a/+++ b/
b
}
s,\(^+++ \)\(./\)*,\1b/,
' "$p"
done
sed -i '/^patch_args=/d' $template
done
```
44 lines
1.6 KiB
Diff
44 lines
1.6 KiB
Diff
--- a/Lib/ctypes/util.py
|
|
+++ b/Lib/ctypes/util.py
|
|
@@ -204,6 +204,41 @@
|
|
def find_library(name, is64 = False):
|
|
return _get_soname(_findLib_crle(name, is64) or _findLib_gcc(name))
|
|
|
|
+ elif True:
|
|
+
|
|
+ # Patched for Alpine Linux / musl - search manually system paths
|
|
+ def _is_elf(filepath):
|
|
+ try:
|
|
+ with open(filepath, 'rb') as fh:
|
|
+ return fh.read(4) == b'\x7fELF'
|
|
+ except:
|
|
+ return False
|
|
+
|
|
+ def find_library(name):
|
|
+ from glob import glob
|
|
+ # absolute name?
|
|
+ if os.path.isabs(name):
|
|
+ return name
|
|
+ # special case for libm, libcrypt and libpthread and musl
|
|
+ if name in ['m', 'crypt', 'pthread']:
|
|
+ name = 'c'
|
|
+ elif name in ['libm.so', 'libcrypt.so', 'libpthread.so']:
|
|
+ name = 'libc.so'
|
|
+ # search in standard locations (musl order)
|
|
+ paths = ['/lib', '/usr/local/lib', '/usr/lib']
|
|
+ if 'LD_LIBRARY_PATH' in os.environ:
|
|
+ paths = os.environ['LD_LIBRARY_PATH'].split(':') + paths
|
|
+ for d in paths:
|
|
+ f = os.path.join(d, name)
|
|
+ if _is_elf(f):
|
|
+ return os.path.basename(f)
|
|
+
|
|
+ prefix = os.path.join(d, 'lib'+name)
|
|
+ for suffix in ['.so', '.so.*']:
|
|
+ for f in glob('{0}{1}'.format(prefix, suffix)):
|
|
+ if _is_elf(f):
|
|
+ return os.path.basename(f)
|
|
+
|
|
else:
|
|
|
|
def _findSoname_ldconfig(name):
|