diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-04-05 17:16:11 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-04-05 17:16:11 (GMT) |
| commit | 8b5fe8c9ec3f961ec9b09844eca6225f06af5b0b (patch) | |
| tree | c3aa7ee1a19fa725942fc168ca3e0b8c6e0abee3 /Makefile | |
| parent | 11766ca4a89ba960271e94281463d1b44654ca3b (diff) | |
| download | git-8b5fe8c9ec3f961ec9b09844eca6225f06af5b0b.zip git-8b5fe8c9ec3f961ec9b09844eca6225f06af5b0b.tar.gz git-8b5fe8c9ec3f961ec9b09844eca6225f06af5b0b.tar.bz2 | |
Revert "Link against libiconv on IRIX"
Brandon Casey reports:
Subject: Re: [PATCH] Link against libiconv on IRIX
Date: Mon, 05 Apr 2010 11:45:32 -0500
Message-Id: <1UypQMCHLT57SnjSQIM66RTkLalsvavG8xXoQJv4rEQ@cipher.nrlssc.navy.mil>
This breaks compilation on IRIX 6.5.29m for me since there
is no separate libiconv.so.
What version of IRIX are you using?
On my system, even the iconv utility doesn't link against
a libiconv shared object. It seems the iconv functionality is in libc.
# ldd /usr/bin/iconv
libc.so.1 => /usr/lib32/libc.so.1
Could it be that you are using a third party iconv library?
I've experienced this on another system and the problem was related
to curl. In that case, curl was linked against an external iconv and
not the native library, so if I tried to build with curl support, I had
to also build against the external iconv library.
While we wait for an improved solution, revert the regression caused by
21704227904b51197976c61c595b52d807677533.
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 2 |
1 files changed, 0 insertions, 2 deletions
@@ -922,7 +922,6 @@ ifeq ($(uname_S),IRIX) SNPRINTF_RETURNS_BOGUS = YesPlease SHELL_PATH = /usr/gnu/bin/bash NEEDS_LIBGEN = YesPlease - NEEDS_LIBICONV = YesPlease endif ifeq ($(uname_S),IRIX64) NO_SETENV=YesPlease @@ -941,7 +940,6 @@ ifeq ($(uname_S),IRIX64) SNPRINTF_RETURNS_BOGUS = YesPlease SHELL_PATH=/usr/gnu/bin/bash NEEDS_LIBGEN = YesPlease - NEEDS_LIBICONV = YesPlease endif ifeq ($(uname_S),HP-UX) NO_IPV6=YesPlease |