From 9ce4b28b3533eaf59ee99b2f9abcacf85b7ce5d3 Mon Sep 17 00:00:00 2001 From: Kevin Liu Date: Fri, 29 Jul 2016 14:34:42 -0400 Subject: [PATCH 1/2] Fix build on Arch Linux --- src/osflags | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/osflags b/src/osflags index 6af11aa..a56ebaa 100644 --- a/src/osflags +++ b/src/osflags @@ -19,7 +19,7 @@ link) Linux) FLAGS=""; [ -e /usr/include/selinux/selinux.h ] && FLAGS="$FLAGS -lselinux"; - [ -e /usr/include/systemd/sd-daemon.h ] && FLAGS="$FLAGS $(pkg-config --libs libsystemd-daemon)"; + [ -e /usr/include/systemd/sd-daemon.h ] && FLAGS="$FLAGS $(pkg-config --libs libsystemd)"; echo $FLAGS; ;; esac From 9640f3ede6c49cfe36cd8ba819ddf3c5dfe1dbf0 Mon Sep 17 00:00:00 2001 From: Kevin Liu Date: Fri, 29 Jul 2016 14:35:05 -0400 Subject: [PATCH 2/2] Add window.c to Android.mk --- src/Android.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Android.mk b/src/Android.mk index 81136e5..cfbad40 100644 --- a/src/Android.mk +++ b/src/Android.mk @@ -16,7 +16,7 @@ HEAD_COMMIT = `git rev-parse --short HEAD` include $(CLEAR_VARS) LOCAL_MODULE := iodine -LOCAL_SRC_FILES := tun.c dns.c read.c encoding.c login.c base32.c base64.c base64u.c base128.c md5.c common.c iodine.c client.c util.c +LOCAL_SRC_FILES := tun.c dns.c read.c encoding.c login.c base32.c base64.c base64u.c base128.c md5.c common.c iodine.c client.c window.c util.c LOCAL_CFLAGS := -c -DANDROID -DLINUX -DIFCONFIGPATH=\"/system/bin/\" -Wall -DGITREVISION=\"$(HEAD_COMMIT)\" LOCAL_LDLIBS := -lz