From 06541894ea6dc2f187ffb7c63e40bb687e6e56e7 Mon Sep 17 00:00:00 2001 From: danghvu Date: Sun, 25 Dec 2016 21:46:52 -0600 Subject: [PATCH 1/3] Makefile: uc.o and list.o is compiled with qemu, fix for issue #696 --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 8c9d60e6..70d0e866 100644 --- a/Makefile +++ b/Makefile @@ -210,7 +210,7 @@ qemu/config-host.h-timestamp: unicorn: $(LIBRARY) $(ARCHIVE) -$(LIBRARY): qemu/config-host.h-timestamp uc.o list.o +$(LIBRARY): qemu/config-host.h-timestamp ifeq ($(UNICORN_SHARED),yes) ifeq ($(V),0) $(call log,GEN,$(LIBRARY)) @@ -222,7 +222,7 @@ else endif endif -$(ARCHIVE): qemu/config-host.h-timestamp uc.o list.o +$(ARCHIVE): qemu/config-host.h-timestamp ifeq ($(UNICORN_STATIC),yes) ifeq ($(V),0) $(call log,GEN,$(ARCHIVE)) From e9b8968a23b3ab8b6e380d681b024b5ebb24c2de Mon Sep 17 00:00:00 2001 From: Nguyen Anh Quynh Date: Mon, 26 Dec 2016 13:12:15 +0800 Subject: [PATCH 2/3] Update install-cmocka-linux.sh temporarily fix the cmocka download issue by avoid using https --- install-cmocka-linux.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install-cmocka-linux.sh b/install-cmocka-linux.sh index 46b405a4..0c6eda79 100755 --- a/install-cmocka-linux.sh +++ b/install-cmocka-linux.sh @@ -1,7 +1,7 @@ #!/bin/sh set -ex mkdir cmocka -wget https://cmocka.org/files/1.1/cmocka-1.1.0.tar.xz -O /tmp/cmocka-1.1.0.tar.xz +wget --no-check-certificate http://cmocka.org/files/1.1/cmocka-1.1.0.tar.xz -O /tmp/cmocka-1.1.0.tar.xz tar -xf /tmp/cmocka-1.1.0.tar.xz -C /tmp cd cmocka && cmake -DUNIT_TESTING=On /tmp/cmocka-1.1.0 && make && make test # cmake builds an so instead of a dll in mingw/msys From 8a9a5432c37d8a65777262d832ea14116c488904 Mon Sep 17 00:00:00 2001 From: Nguyen Anh Quynh Date: Mon, 26 Dec 2016 13:45:40 +0800 Subject: [PATCH 3/3] add back as a comment the https download for cmocka to install-cmocka-linux.sh --- install-cmocka-linux.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/install-cmocka-linux.sh b/install-cmocka-linux.sh index 0c6eda79..a9530ac2 100755 --- a/install-cmocka-linux.sh +++ b/install-cmocka-linux.sh @@ -1,6 +1,7 @@ #!/bin/sh set -ex mkdir cmocka +#wget https://cmocka.org/files/1.1/cmocka-1.1.0.tar.xz -O /tmp/cmocka-1.1.0.tar.xz wget --no-check-certificate http://cmocka.org/files/1.1/cmocka-1.1.0.tar.xz -O /tmp/cmocka-1.1.0.tar.xz tar -xf /tmp/cmocka-1.1.0.tar.xz -C /tmp cd cmocka && cmake -DUNIT_TESTING=On /tmp/cmocka-1.1.0 && make && make test