Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 2 Feb 2016 11:51:19 +0000 (UTC)
From:      Hajimu UMEMOTO <ume@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r295147 - head/bin/csh
Message-ID:  <201602021151.u12BpJY7087808@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: ume
Date: Tue Feb  2 11:51:18 2016
New Revision: 295147
URL: https://svnweb.freebsd.org/changeset/base/295147

Log:
  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.
  
  Spotted by:	Yoshihiko Sarumaru
  MFC after:	1 days

Modified:
  head/bin/csh/iconv_stub.c

Modified: head/bin/csh/iconv_stub.c
==============================================================================
--- head/bin/csh/iconv_stub.c	Tue Feb  2 11:36:58 2016	(r295146)
+++ head/bin/csh/iconv_stub.c	Tue Feb  2 11:51:18 2016	(r295147)
@@ -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 *);
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201602021151.u12BpJY7087808>