7fc9190f0e
* gcc is kept at -Np0, because of void-cross
```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
```
29 lines
974 B
Diff
29 lines
974 B
Diff
Use the generic sigemptyset() available on both, glibc and musl libc
|
|
The SA_INTERRUPT is not defined in musl libc. Copy the (unused?)
|
|
definition from glibc's header bits/sigaction.h
|
|
|
|
--- a/src/prog/gpm-root.y 2012-10-26 23:21:38.000000000 +0200
|
|
+++ b/src/prog/gpm-root.y 2015-06-22 15:56:19.167982843 +0200
|
|
@@ -56,6 +56,9 @@
|
|
#define minor(dev) ((dev)&0xff)
|
|
#endif
|
|
|
|
+#if !defined(SA_INTERRUPT)
|
|
+# define SA_INTERRUPT 0x20000000 /* Historical no-op. */
|
|
+#endif
|
|
|
|
#define GPM_NULL_DEV "/dev/null"
|
|
|
|
@@ -1196,11 +1199,7 @@
|
|
LOG_DAEMON : LOG_USER);
|
|
/* reap your zombies */
|
|
childaction.sa_handler=reap_children;
|
|
-#if defined(__GLIBC__)
|
|
- __sigemptyset(&childaction.sa_mask);
|
|
-#else /* __GLIBC__ */
|
|
- childaction.sa_mask=0;
|
|
-#endif /* __GLIBC__ */
|
|
+ sigemptyset(&childaction.sa_mask);
|
|
childaction.sa_flags=SA_INTERRUPT; /* need to break the select() call */
|
|
sigaction(SIGCHLD,&childaction,NULL);
|
|
|