svn commit: r297585 - stable/10/bin/csh

Hajimu UMEMOTO ume at FreeBSD.org
Tue Apr 5 14:41:35 UTC 2016


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 *);
 


More information about the svn-src-stable-10 mailing list