65749575ab
```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
```
23 lines
715 B
Diff
23 lines
715 B
Diff
__GLIBC_PREREQ is only defined with glibc, so that only process it with __GLIBC__.
|
|
|
|
--- a/syscall.c 2014-10-20 16:12:53.000000000 +0200
|
|
+++ b/syscall.c 2015-06-22 08:13:22.729034702 +0200
|
|
@@ -115,14 +115,16 @@
|
|
|
|
#endif
|
|
|
|
-#if defined(__GLIBC__) && __GLIBC_PREREQ(2, 11)
|
|
+#if defined(__GLIBC__)
|
|
+# if __GLIBC_PREREQ(2,11)
|
|
|
|
/* glibc 2.11 seems to have working 6 argument sycall. Use the
|
|
glibc supplied syscall in this case.
|
|
The version cut-off is rather arbitary and could be probably
|
|
earlier. */
|
|
|
|
-#define syscall6 syscall
|
|
+# define syscall6 syscall
|
|
+#endif
|
|
#elif defined(__x86_64__)
|
|
/* 6 argument calls on x86-64 are often buggy in both glibc and
|
|
asm/unistd.h. Add a working version here. */
|