summaryrefslogtreecommitdiffstats
path: root/package/softether/0005-iconv.patch
diff options
context:
space:
mode:
authorBernd Kuhls <bernd.kuhls@t-online.de>2014-10-04 23:44:58 +0200
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>2015-03-08 15:53:12 +0100
commit6aa6a84de0c08da282c443c7688409ce3c1a0edf (patch)
tree5599b5291399c8d6f657a3c807a1b7c1631e1275 /package/softether/0005-iconv.patch
parent063ff25f6aeb626da03c49d5216bdd3c6b4f0482 (diff)
downloadbuildroot-6aa6a84de0c08da282c443c7688409ce3c1a0edf.tar.gz
buildroot-6aa6a84de0c08da282c443c7688409ce3c1a0edf.zip
package/softether: New package
Package description was copied from https://launchpad.net/~dajhorn/+archive/ubuntu/softether/ [Thomas: - reorganize patches by pulling the two biggest patches from Github, and only having the remaining patches in Buildroot. - use a full destination path when installing hamcorebuilder in $(HOST_DIR)/usr/bin. - minor reformatting.] Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package/softether/0005-iconv.patch')
-rw-r--r--package/softether/0005-iconv.patch28
1 files changed, 28 insertions, 0 deletions
diff --git a/package/softether/0005-iconv.patch b/package/softether/0005-iconv.patch
new file mode 100644
index 0000000000..09d7777e42
--- /dev/null
+++ b/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>
+ #endif // MAYAQUA_SUPPORTS_GETIFADDRS
+
+-#ifdef UNIX_LINUX
+-typedef void *iconv_t;
+-iconv_t iconv_open (__const char *__tocode, __const char *__fromcode);
+-size_t iconv (iconv_t __cd, char **__restrict __inbuf,
+- size_t *__restrict __inbytesleft,
+- char **__restrict __outbuf,
+- size_t *__restrict __outbytesleft);
+-int iconv_close (iconv_t __cd);
+-#else // UNIX_LINUX
+ #include <iconv.h>
+-#endif // UNIX_LINUX
+
+
+
OpenPOWER on IntegriCloud