From owner-svn-src-all@freebsd.org  Tue Apr  5 14:41:35 2016
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id A4C9FB045CF;
 Tue,  5 Apr 2016 14:41:35 +0000 (UTC) (envelope-from ume@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 75D3E1BB7;
 Tue,  5 Apr 2016 14:41:35 +0000 (UTC) (envelope-from ume@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u35EfYfS029566;
 Tue, 5 Apr 2016 14:41:34 GMT (envelope-from ume@FreeBSD.org)
Received: (from ume@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u35EfYZF029565;
 Tue, 5 Apr 2016 14:41:34 GMT (envelope-from ume@FreeBSD.org)
Message-Id: <201604051441.u35EfYZF029565@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ume set sender to ume@FreeBSD.org
 using -f
From: Hajimu UMEMOTO <ume@FreeBSD.org>
Date: Tue, 5 Apr 2016 14:41:34 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r297585 - stable/10/bin/csh
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.21
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 05 Apr 2016 14:41:35 -0000

Author: ume
Date: Tue Apr  5 14:41:34 2016
New Revision: 297585
URL: https://svnweb.freebsd.org/changeset/base/297585

Log:
  MFC r295147:
    Make dynamic link of libiconv from ports work again.
    The symbols of libiconv from ports were changed to
    have prefixed.
    Since we have iconv in our libc these days, we don't
    need it on 10.X and later.  However, 9.X still need
    this.

Modified:
  stable/10/bin/csh/iconv_stub.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/bin/csh/iconv_stub.c
==============================================================================
--- stable/10/bin/csh/iconv_stub.c	Tue Apr  5 13:56:43 2016	(r297584)
+++ stable/10/bin/csh/iconv_stub.c	Tue Apr  5 14:41:34 2016	(r297585)
@@ -36,9 +36,9 @@
 #undef iconv_close
 
 #define ICONVLIB	"libiconv.so"
-#define ICONV_ENGINE	"iconv"
-#define ICONV_OPEN	"iconv_open"
-#define ICONV_CLOSE	"iconv_close"
+#define ICONV_ENGINE	"libiconv"
+#define ICONV_OPEN	"libiconv_open"
+#define ICONV_CLOSE	"libiconv_close"
 
 typedef iconv_t iconv_open_t(const char *, const char *);