The Samba-Bugzilla – Attachment 9500 Details for
Bug 9911
Build Samba 4.0.x on AIX with IBM XL C/C++ (gettext detection issues)
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
next try
9911_next.patch (text/plain), 2.77 KB, created by
Christian Ambach
on 2013-12-03 19:31:06 UTC
(
hide
)
Description:
next try
Filename:
MIME Type:
Creator:
Christian Ambach
Created:
2013-12-03 19:31:06 UTC
Size:
2.77 KB
patch
obsolete
>From ec150ba85fdb96502a5a7907d70feecbe41b83b6 Mon Sep 17 00:00:00 2001 >From: Christian Ambach <ambi@samba.org> >Date: Thu, 21 Nov 2013 23:02:38 +0100 >Subject: [PATCH] waf: fix up libintl related checks > >checklibc=True and link=True gives back false-positives >on AIX for gettext/dgettext and so the build fails later when >libintl.h is not available > >So let's check this very pedantically > >Signed-off-by: Christian Ambach <ambi@samba.org> >--- > lib/replace/wscript | 12 +++++++----- > 1 file changed, 7 insertions(+), 5 deletions(-) > >diff --git a/lib/replace/wscript b/lib/replace/wscript >index b6fb10b..3e43366 100644 >--- a/lib/replace/wscript >+++ b/lib/replace/wscript >@@ -369,26 +369,28 @@ removeea setea > conf.CHECK_LIB('intl') > # *textdomain functions are not strictly necessary > conf.CHECK_FUNCS_IN('bindtextdomain textdomain bind_textdomain_codeset', >- '', checklibc=True, headers='libintl.h') >+ '', checklibc=False, link=False, headers='libintl.h') > # gettext and dgettext must exist > # on some systems (the ones with glibc, those are in libc) >- if conf.CHECK_FUNCS_IN('dgettext gettext', '', checklibc=True, headers='libintl.h'): >+ if conf.CHECK_FUNCS_IN('dgettext gettext', '', checklibc=False, >+ link=False, headers='libintl.h'): > # save for dependency definitions > conf.env.intl_libs='' > # others (e.g. FreeBSD) have seperate libintl >- elif conf.CHECK_FUNCS_IN('dgettext gettext', 'intl', checklibc=False, headers='libintl.h'): >+ elif conf.CHECK_FUNCS_IN('dgettext gettext', 'intl', checklibc=False, >+ link=False, headers='libintl.h'): > # save for dependency definitions > conf.env.intl_libs='intl' > # recheck with libintl > conf.CHECK_FUNCS_IN('bindtextdomain textdomain bind_textdomain_codeset', >- 'intl', checklibc=False, headers='libintl.h') >+ 'intl', checklibc=False, link=False, headers='libintl.h') > else: > # Some hosts need lib iconv for linking with lib intl > # So we try with flags just in case it helps. > oldflags = conf.env['EXTRA_LDFLAGS']; > conf.env['EXTRA_LDFLAGS'].extend("-liconv") > conf.CHECK_FUNCS_IN('dgettext gettext bindtextdomain textdomain bind_textdomain_codeset', >- 'intl', checklibc=False, headers='libintl.h') >+ 'intl', checklibc=False, link=False, headers='libintl.h') > conf.env['EXTRA_LDFLAGS'] = oldflags > if conf.env['HAVE_GETTEXT'] and conf.env['HAVE_DGETTEXT']: > # save for dependency definitions >-- >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 9911
:
8964
|
8987
|
8998
|
9007
|
9106
|
9107
|
9114
|
9115
|
9127
|
9419
|
9482
|
9483
|
9500
|
9554
|
9746
|
9747