summaryrefslogtreecommitdiffstats
path: root/meta-networking/recipes-connectivity/samba/samba/iconv-4.7.0.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta-networking/recipes-connectivity/samba/samba/iconv-4.7.0.patch')
-rw-r--r--meta-networking/recipes-connectivity/samba/samba/iconv-4.7.0.patch25
1 files changed, 25 insertions, 0 deletions
diff --git a/meta-networking/recipes-connectivity/samba/samba/iconv-4.7.0.patch b/meta-networking/recipes-connectivity/samba/samba/iconv-4.7.0.patch
new file mode 100644
index 000000000..5ae8c5978
--- /dev/null
+++ b/meta-networking/recipes-connectivity/samba/samba/iconv-4.7.0.patch
@@ -0,0 +1,25 @@
1samba: defeat iconv test
2
3A test was added when configuring samba which requires target code
4to be executed. In general, this will not work, so we eliminate it.
5
6Upstream-Status: Pending
7
8Signed-off-by: Joe Slater <joe.slater@windriver.com>
9
10--- a/lib/util/charset/wscript_configure
11+++ b/lib/util/charset/wscript_configure
12@@ -17,6 +17,8 @@ if (conf.CHECK_FUNCS_IN('iconv_open', 'i
13
14 conf.DEFINE('HAVE_NATIVE_ICONV', 1)
15
16+"""
17+[added for 4.7.0, but breaks cross-compilation]
18 conf.CHECK_CODE('''
19 uint8_t inbuf[2] = { 0x30, 0xdf };
20 uint8_t outbuf[4] = { 0 };
21@@ -36,3 +38,4 @@ conf.CHECK_CODE('''
22 msg='Checking errno of iconv for illegal multibyte sequence',
23 lib='iconv',
24 headers='errno.h iconv.h')
25+"""