The Samba-Bugzilla – Attachment 9516 Details for
Bug 10308
String Conversion Errors with Samba 4.1.0 Build on AIX 7.1
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
possible patch
10308.patch (text/plain), 1.67 KB, created by
Christian Ambach
on 2013-12-07 10:18:37 UTC
(
hide
)
Description:
possible patch
Filename:
MIME Type:
Creator:
Christian Ambach
Created:
2013-12-07 10:18:37 UTC
Size:
1.67 KB
patch
obsolete
>From c0125a774b2663e47601b33a53cd813f688ed376 Mon Sep 17 00:00:00 2001 >From: Christian Ambach <ambi@samba.org> >Date: Wed, 4 Dec 2013 22:50:11 +0100 >Subject: [PATCH] waf: improve iconv checks > >there are broken iconv implementations around (e.g. on AIX) that you >can compile against but that refuse any mapping requests > >make sure we do the same as the autoconf-based build did and >fall back to our own code > >Bug: https://bugzilla.samba.org/show_bug.cgi?id=10308 > >Signed-off-by: Christian Ambach <ambi@samba.org> >--- > source3/build/charset.py | 10 ++++++++-- > 1 file changed, 8 insertions(+), 2 deletions(-) > >diff --git a/source3/build/charset.py b/source3/build/charset.py >index 44852a6..cbbb320 100644 >--- a/source3/build/charset.py >+++ b/source3/build/charset.py >@@ -33,8 +33,14 @@ def CHECK_SAMBA3_CHARSET(conf, crossbuild=False): > default_unix_charset="UTF-8" > # TODO: this used to warn about the set charset on cross builds > >- conf.DEFINE('DEFAULT_DOS_CHARSET', default_dos_charset, quote=True) >- conf.DEFINE('DEFAULT_UNIX_CHARSET', default_unix_charset, quote=True) >+ if default_dos_charset is False or default_unix_charset is False: >+ # we found iconv, but it failed to convert anything (e.g. on AIX) >+ conf.undefine('HAVE_NATIVE_ICONV'); >+ conf.DEFINE('DEFAULT_DOS_CHARSET', "ASCII", quote=True) >+ conf.DEFINE('DEFAULT_UNIX_CHARSET', "UTF8", quote=True) >+ else: >+ conf.DEFINE('DEFAULT_DOS_CHARSET', default_dos_charset, quote=True) >+ conf.DEFINE('DEFAULT_UNIX_CHARSET', default_unix_charset, quote=True) > > else: > conf.DEFINE('DEFAULT_DOS_CHARSET', "ASCII", quote=True) >-- >1.8.1.2 >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Raw
Actions:
View
Attachments on
bug 10308
:
9516
|
9748