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.

Junio C Hamano committed Apr 5, 2010 at 10:16 UTC 8b5fe8c9ec3f961ec9b09844eca6225f06af5b0b

1 file changed -2

Makefile

-2

@@ -922,7 +922,6 @@ ifeq ($(uname_S),IRIX)

922 SNPRINTF_RETURNS_BOGUS = YesPlease

923 SHELL_PATH = /usr/gnu/bin/bash

924 NEEDS_LIBGEN = YesPlease

925 - NEEDS_LIBICONV = YesPlease

925 endif

926 ifeq ($(uname_S),IRIX64)

927 NO_SETENV=YesPlease

@@ -941,7 +940,6 @@ ifeq ($(uname_S),IRIX64)

940 SNPRINTF_RETURNS_BOGUS = YesPlease

941 SHELL_PATH=/usr/gnu/bin/bash

942 NEEDS_LIBGEN = YesPlease

944 - NEEDS_LIBICONV = YesPlease

943 endif

944 ifeq ($(uname_S),HP-UX)

945 NO_IPV6=YesPlease