git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: "Дилян Палаузов" <dilyan.palauzov@aegee.org>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, wxs@FreeBSD.org,
	Dmitry Marakasov <amdmi3@amdmi3.ru>
Subject: Re: [PATCH] configure.ac: link with -liconv for locale_charset()
Date: Tue, 11 Mar 2014 23:37:33 +0100	[thread overview]
Message-ID: <531F902D.4050102@aegee.org> (raw)
In-Reply-To: <xmqqsiqoo4ma.fsf@gitster.dls.corp.google.com>

Hello,

this changes effectively the meaning of CHARSET_LIB to 
always/unconditionally contain the library with the charset_locale () 
function.  The snippet at the end of the email updates the description 
in /Makefile .

However, I checked now how gnulib deals with locale_charset ().  Contary 
to my expectation, where gnulib builds only functions if they are not 
found in libraries on the target system, gnulib module localcharset 
builds unconditionally from source the function locale_charset ().  I 
guess they do this in a portable way, but still.

My preference is to agree on universal approach for finding this 
function, something like:
   OK, if found in libiconv, else
   OK, if found in libcharset, else
   OK, here are the sources, build the function from them, and don't 
look for it in (shared) libaries

I asked at bug-gnulib@ why they build locale_charset() before checking 
for it in libiconv / libcharset.  My posting shall appear at 
http://lists.gnu.org/archive/html/bug-gnulib/2014-03/index.html .  Let's 
see what the answer will be.

I don't know if in the git codebase generally is refused to use gnulib 
code, but if you agree on the above procedure with 3xOK, then 
locale_charset() will be available even on systems, that don't have this 
function in libcharset or libiconv.... Maybe /compat/poll/poll.[ch] in 
git-core from gnulib had similar history.

Kind regards
   Дилян


On 11.03.2014 21:35, Junio C Hamano wrote:
> Dmitry Marakasov <amdmi3@amdmi3.ru> writes:
>
>> On e.g. FreeBSD 10.x, the following situation is common:
>> - there's iconv implementation in libc, which has no locale_charset()
>>    function
>> - there's GNU libiconv installed from Ports Collection
>>
>> Git build process
>> - detects that iconv is in libc and thus -liconv is not needed for it
>> - detects locale_charset in -liconv, but for some reason doesn't add it
>>    to CHARSET_LIB (as it would do with -lcharset if locale_charset() was
>>    found there instead of -liconv)
>> - git doesn't build due to unresolved external locale_charset()
>>
>> Fix this by adding -liconv to CHARSET_LIB if locale_charset() is
>> detected in this library.
>>
>> Signed-off-by: Dmitry Marakasov <amdmi3@amdmi3.ru>
>> ---
>
> Looks sensible; Dilyan, any comments?
>
>>   configure.ac | 2 +-
>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git configure.ac configure.ac
>> index 2f43393..3f5c644 100644
>> --- configure.ac
>> +++ configure.ac
>> @@ -890,7 +890,7 @@ GIT_CONF_SUBST([HAVE_STRINGS_H])
>>   # and libcharset does
>>   CHARSET_LIB=
>>   AC_CHECK_LIB([iconv], [locale_charset],
>> -       [],
>> +       [CHARSET_LIB=-liconv],
>>          [AC_CHECK_LIB([charset], [locale_charset],
>>                        [CHARSET_LIB=-lcharset])])
>>   GIT_CONF_SUBST([CHARSET_LIB])


----------
diff --git a/Makefile b/Makefile
index dddaf4f..dce4694 100644
--- a/Makefile
+++ b/Makefile
@@ -59,9 +59,9 @@ all::
  # FreeBSD can use either, but MinGW and some others need to use
  # libcharset.h's locale_charset() instead.
  #
-# Define CHARSET_LIB to you need to link with library other than -liconv to
+# Define CHARSET_LIB to the library you need to link with in order to
  # use locale_charset() function.  On some platforms this needs to set to
-# -lcharset
+# -lcharset, on others to -liconv .
  #
  # Define LIBC_CONTAINS_LIBINTL if your gettext implementation doesn't
  # need -lintl when linking.

  reply	other threads:[~2014-03-11 22:55 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-03-11 18:35 [PATCH] configure.ac: link with -liconv for locale_charset() Dmitry Marakasov
2014-03-11 20:35 ` Junio C Hamano
2014-03-11 22:37   ` Дилян Палаузов [this message]
2014-03-20 21:12     ` Junio C Hamano
2014-03-11 22:39   ` Dmitry Marakasov
2014-03-12  0:57   ` Dmitry Marakasov

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=531F902D.4050102@aegee.org \
    --to=dilyan.palauzov@aegee.org \
    --cc=amdmi3@amdmi3.ru \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=wxs@FreeBSD.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).