summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Woodfall <dave@dawoodfall.net>2013-11-18 21:57:45 -0600
committerRobby Workman <rworkman@slackbuilds.org>2013-11-18 21:57:45 -0600
commitd6c291d706abbdeeedade41197ddf7a852c815d4 (patch)
treef950f9c7499a4a79481cbb4d009642f6a627acd9
parent3c68e64dc8e7df356b6a64931c93afea0349625c (diff)
downloadslackbuilds-d6c291d706abbdeeedade41197ddf7a852c815d4.tar.gz
system/qemu-legacy: Patched for siginfo/info struct error
Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
-rw-r--r--system/qemu-legacy/qemu-legacy.SlackBuild3
-rw-r--r--system/qemu-legacy/siginfo-typedef.patch25
2 files changed, 28 insertions, 0 deletions
diff --git a/system/qemu-legacy/qemu-legacy.SlackBuild b/system/qemu-legacy/qemu-legacy.SlackBuild
index 720be0bb1a..649b0986ba 100644
--- a/system/qemu-legacy/qemu-legacy.SlackBuild
+++ b/system/qemu-legacy/qemu-legacy.SlackBuild
@@ -70,6 +70,9 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \;
+# Fix the siginfo/info struct error
+patch -p1 < $CWD/siginfo-typedef.patch
+
# For some reason it doesn't find SDL.h
CFLAGS="$SLKCFLAGS -I/usr/include/SDL" \
CXXFLAGS="$SLKCFLAGS" \
diff --git a/system/qemu-legacy/siginfo-typedef.patch b/system/qemu-legacy/siginfo-typedef.patch
new file mode 100644
index 0000000000..9c3a455a64
--- /dev/null
+++ b/system/qemu-legacy/siginfo-typedef.patch
@@ -0,0 +1,25 @@
+diff -Naur a/linux-user/signal.c b/linux-user/signal.c
+--- a/linux-user/signal.c 2009-12-02 20:27:02.000000000 +0000
++++ b/linux-user/signal.c 2013-11-18 00:48:22.345001621 +0000
+@@ -3059,6 +3059,10 @@
+ uint32_t tramp[2];
+ };
+
++// fix for 'incomplete type struct siginfo info' error
++typedef struct siginfo {
++} siginfo;
++
+ struct rt_signal_frame {
+ struct siginfo info;
+ struct ucontext uc;
+@@ -3276,6 +3280,10 @@
+ uint8_t retcode[8]; /* Trampoline code. */
+ };
+
++// fix for 'incomplete type struct siginfo info' error
++typedef struct siginfo {
++} siginfo;
++
+ struct rt_signal_frame {
+ struct siginfo *pinfo;
+ void *puc;