diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-04-04 18:49:12 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-04-04 18:49:12 +0200 |
| commit | 5b582722781320d42a69d9398f8d5bdaac2abd52 (patch) | |
| tree | d56740d3de6380a370551329f99a16e144f7f685 | |
| parent | cf494122e89c1f3674079ad3de3604f8d8e94b0b (diff) | |
fix musl compile
| -rw-r--r-- | package/qemu/Makefile | 5 | ||||
| -rw-r--r-- | package/qemu/patches/patch-linux-user_syscall_c | 11 |
2 files changed, 14 insertions, 2 deletions
diff --git a/package/qemu/Makefile b/package/qemu/Makefile index 6ca93afa3..6f5d3956a 100644 --- a/package/qemu/Makefile +++ b/package/qemu/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:= qemu PKG_VERSION:= 1.7.1 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= 9541063d999cf9659ed7fdce71314f31 PKG_DESCR:= cpu and system emulator PKG_SECTION:= misc @@ -25,6 +25,9 @@ include $(TOPDIR)/mk/package.mk $(eval $(call HOST_template,QEMU,qemu,$(PKG_VERSION)-${PKG_RELEASE})) $(eval $(call PKG_template,QEMU,qemu,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +ifeq ($(ADK_TARGET_LIB_MUSL),y) +TARGET_CFLAGS+= -DF_EXLCK=4 -DF_SHLCK=8 -D__SIGRTMIN=32 -D__SIGRTMAX=\(NSIG-1\) +endif CONFIG_STYLE:= minimal CONFIGURE_ARGS+= --host-cc=$(CC_FOR_BUILD) \ --cross-prefix=$(GNU_TARGET_NAME)- \ diff --git a/package/qemu/patches/patch-linux-user_syscall_c b/package/qemu/patches/patch-linux-user_syscall_c index aa243b148..11188ca90 100644 --- a/package/qemu/patches/patch-linux-user_syscall_c +++ b/package/qemu/patches/patch-linux-user_syscall_c @@ -1,5 +1,5 @@ --- qemu-1.7.1.orig/linux-user/syscall.c 2014-03-25 15:01:10.000000000 +0100 -+++ qemu-1.7.1/linux-user/syscall.c 2014-04-02 16:56:13.483513278 +0200 ++++ qemu-1.7.1/linux-user/syscall.c 2014-04-04 16:51:08.292546548 +0200 @@ -63,6 +63,7 @@ int __clone2(int (*fn)(void *), void *ch //#include <sys/user.h> #include <netinet/ip.h> @@ -24,3 +24,12 @@ #include <linux/kd.h> #include <linux/mtio.h> #include <linux/fs.h> +@@ -400,7 +409,7 @@ static int sys_inotify_init1(int flags) + #endif + #define __NR_sys_ppoll __NR_ppoll + _syscall5(int, sys_ppoll, struct pollfd *, fds, nfds_t, nfds, +- struct timespec *, timeout, const __sigset_t *, sigmask, ++ struct timespec *, timeout, const sigset_t *, sigmask, + size_t, sigsetsize) + #endif + |