The cirros image was rebuilt against the 3.13.0-83 kernel, drivers e1000e, igbvf...

[packages/trusty/cirros-testvm.git] / cirros-testvm / src-cirros / buildroot-2015.05 / package / softether / 0005-iconv.patch

diff --git a/cirros-testvm/src-cirros/buildroot-2015.05/package/softether/0005-iconv.patch b/cirros-testvm/src-cirros/buildroot-2015.05/package/softether/0005-iconv.patch
new file mode 100644 (file)
index 0000000..09d7777
--- /dev/null
+++ b/cirros-testvm/src-cirros/buildroot-2015.05/package/softether/0005-iconv.patch
@@ -0,0 +1,28 @@
+Fix linking with libiconv
+
+Inspired by https://github.com/el1n/OpenWRT-package-softether/blob/4cb1cd9073a76edf34c512e587069626e02e2404/patches/120-fix-iconv-headers-common.patch
+
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+
+Index: b/src/Mayaqua/Mayaqua.h
+===================================================================
+--- a/src/Mayaqua/Mayaqua.h
++++ b/src/Mayaqua/Mayaqua.h
+@@ -282,17 +282,7 @@
+ #include <ifaddrs.h>\r
+ #endif        // MAYAQUA_SUPPORTS_GETIFADDRS\r
+ \r
+-#ifdef        UNIX_LINUX\r
+-typedef void *iconv_t;\r
+-iconv_t iconv_open (__const char *__tocode, __const char *__fromcode);\r
+-size_t iconv (iconv_t __cd, char **__restrict __inbuf,\r
+-                     size_t *__restrict __inbytesleft,\r
+-                     char **__restrict __outbuf,\r
+-                     size_t *__restrict __outbytesleft);\r
+-int iconv_close (iconv_t __cd);\r
+-#else // UNIX_LINUX\r
+ #include <iconv.h>\r
+-#endif        // UNIX_LINUX\r
+ \r
+ \r
+ \r