From 3a55a118dde2f1cef80ad8ed446044449cb8417d Mon Sep 17 00:00:00 2001 From: Tijl Coosemans Date: Sat, 10 Oct 2015 14:03:00 +0000 Subject: Remove iconv(), iconv_open() and iconv_close() symbols from libiconv. These were FreeBSD specific aliases for libiconv(), libiconv_open() and libiconv_close() that are now also provided by libc which complicates writing configure tests that work correctly when both libc iconv and libiconv are available. Also, because the libiconv iconv.h header redefines iconv* to libiconv* correct use of the header implies that the aliases aren't used. The following ports needed fixes because there was something wrong with the way they tried to detect or use iconv: audio/deadbeef: Remove LIBICONV_PLUG from a source file. It's a compile-time option and should not be set in source code. comms/hidapi: Use standard AM_ICONV configure macro to look for iconv. deskutils/fbreader: Let ports framework deal with LIBICONV_PLUG. deskutils/ljclive: Override configure test for iconv. deskutils/owncloudclient: Add USES=iconv and patch test for iconv. devel/aegis: Bump PORTREVISION because it no longer uses libiconv. devel/libexplain: Add USES=iconv and override test for iconv. devel/sdl20: Override configure test for iconv. emulators/vmw: Replace OSVERSION checks with ICONV_LIB checks and include instead of . irc/scrollz: Override configure test for iconv. japanese/chasen-base: Override configure test for iconv and patch configure so it no longer adds -liconv to linker flags just because it happens to be installed. japanses/eb: Patch configure test for iconv. japanses/eblook: Override configure test for iconv. java/jikes: Override configure test for iconv. multimedia/transcode: Bump PORTREVISION because only one plugin links with libiconv now. net/c3270: Override configure test for iconv. net/samba4*: Bump PORTREVISION because it no longer uses libiconv. The configure script will always add -liconv to the linker flags when it happens to be installed which would be wrong but later on binaries are linked with -Wl,--as-needed and the linker discards -liconv because it finds iconv*() functions in libc now and no longer in libiconv. net-mgmt/icinga-*: Remove dependency on iconv. net-mgmt/netxms: Patch configure so it no longer adds -liconv to linker flags just because it happens to be installed. net/asterisk11: Patch configure so it no longer adds -liconv to linker flags just because it happens to be installed. net-p2p/transmission-*: Override configure test for iconv. www/htmlcxx: Override configure test for iconv. www/httrack: Override configure test for iconv. www/xapian-omega: Override configure test for iconv. x11/mrxvt(-devel): Add USES=iconv and override configure test for iconv. x11/x3270: Override configure test for iconv. x11-wm/jwm: Override configure test for iconv. PR: 202838 Exp-run by: antoine Approved by: portmgr (antoine) --- japanese/eb/Makefile | 13 +++++------ japanese/eb/files/patch-m4-gettext-m4 | 41 +++++++++++++++++------------------ 2 files changed, 26 insertions(+), 28 deletions(-) (limited to 'japanese/eb') diff --git a/japanese/eb/Makefile b/japanese/eb/Makefile index f1470c53462f..debbb3f59e2b 100644 --- a/japanese/eb/Makefile +++ b/japanese/eb/Makefile @@ -3,7 +3,7 @@ PORTNAME= eb PORTVERSION= 4.4.3 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= japanese MASTER_SITES= ftp://ftp.sra.co.jp/pub/misc/eb/ \ ftp://ftp.sra.co.jp/pub/misc/eb/old/eb-${PORTVERSION:C/^([0-9]+)\.([0-9]+).*/\1.\2/}/ @@ -66,7 +66,9 @@ PORTDOCS= eb-01.html eb-02.html eb-03.html eb-04.html eb-05.html eb-06.html \ USES= autoreconf iconv libtool perl5 tar:bzip2 GNU_CONFIGURE= yes USE_LDCONFIG= yes -CONFIGURE_ARGS= --with-pkgdocdir=${DOCSDIR} +CONFIGURE_ARGS= --with-pkgdocdir=${DOCSDIR} \ + --with-iconv-includes=${ICONV_PREFIX}/include \ + --with-iconv-libraries=${ICONV_PREFIX}/lib CONFIGURE_ENV= ac_cv_path_PERL=${PERL} OPTIONS_DEFINE= DOCS NLS @@ -76,11 +78,8 @@ APPENDIXDIR= ${DATADIR}/appendix NLS_USES= gettext NLS_CONFIGURE_ENABLE= nls -NLS_CONFIGURE_ON= \ - --with-gettext-includes=${LOCALBASE}/include \ - --with-gettext-libraries=${LOCALBASE}/lib \ - --with-iconv-includes=${ICONV_PREFIX}/include \ - --with-iconv-libraries=${ICONV_PREFIX}/lib +NLS_CONFIGURE_ON= --with-gettext-includes=${LOCALBASE}/include \ + --with-gettext-libraries=${LOCALBASE}/lib NLS_CONFIGURE_OFF= --disable-nls post-extract: diff --git a/japanese/eb/files/patch-m4-gettext-m4 b/japanese/eb/files/patch-m4-gettext-m4 index ae2a9bcab759..0d60c52efa5c 100644 --- a/japanese/eb/files/patch-m4-gettext-m4 +++ b/japanese/eb/files/patch-m4-gettext-m4 @@ -1,9 +1,10 @@ ---- m4/gettext.m4.orig 2010-01-03 21:26:04.000000000 +0900 -+++ m4/gettext.m4 2014-04-03 10:20:12.000000000 +0900 -@@ -87,13 +87,19 @@ +--- m4/gettext.m4.orig 2010-01-03 12:26:04 UTC ++++ m4/gettext.m4 +@@ -86,14 +86,17 @@ AC_DEFUN([eb_GNU_GETTEXT], [dnl + save_CPPFLAGS=$CPPFLAGS save_LIBS=$LIBS CPPFLAGS="$save_CPPFLAGS $iconv_includes" - LIBS="$save_LIBS $iconv_libraries" +- LIBS="$save_LIBS $iconv_libraries" - AC_CHECK_LIB(iconv, iconv_open, - [ICONVLIBS="$iconv_libraries -liconv"; LIBS="$LIBS -liconv"]) - AC_CHECK_FUNCS(iconv_open locale_charset) @@ -11,23 +12,21 @@ - if test $ac_cv_func_iconv_open != no; then - ICONVINCS="$iconv_includes" - fi -+ initial_LIBS="$LIBS" -+ AC_SEARCH_LIBS([iconv_open], -+ [iconv], -+ [AS_IF([test "$LIBS" = "$initial_LIBS"], -+ [AC_CHECK_HEADERS([iconv.h]) -+ AC_CHECK_FUNCS([iconv_open]) -+ ICONVLIBS="$iconv_libraries" -+ ICONVINCS="$iconv_includes"], -+ [AC_CHECK_LIB([charset], [locale_charset]) -+ AC_CHECK_HEADERS([iconv.h libcharset.h]) -+ AC_CHECK_FUNCS([iconv_open locale_charset]) -+ ICONVLIBS="$iconv_libraries -lcharset -liconv" -+ ICONVINCS="$iconv_includes"])]) ++ AC_CHECK_HEADER([iconv.h], ++ [AC_DEFINE([HAVE_ICONV_H],[1],[Have iconv.h]) ++ for l in '' -liconv; do ++ LIBS="$save_LIBS $iconv_libraries $l" ++ AC_LINK_IFELSE( ++ AC_LANG_PROGRAM([#include ],[iconv_open("","")]), ++ [AC_DEFINE([HAVE_ICONV_OPEN],[1],[Have iconv_open(3)]) ++ ICONVINCS="$iconv_includes" ++ ICONVLIBS="$iconv_libraries $l" ++ break],[]) ++ done],[]) CPPFLAGS=$save_CPPFLAGS LIBS=$save_LIBS AC_SUBST(ICONVINCS) -@@ -113,10 +119,10 @@ +@@ -113,10 +116,10 @@ AC_DEFUN([eb_GNU_GETTEXT], [dnl save_LIBS=$LIBS dnl * @@ -41,7 +40,7 @@ AC_LINK_IFELSE([ #include #ifdef ENABLE_NLS -@@ -143,8 +149,8 @@ +@@ -143,8 +146,8 @@ main() try_nls=yes, try_nls=no) if test "$try_nls" = yes; then @@ -52,7 +51,7 @@ fi dnl * -@@ -222,11 +228,11 @@ +@@ -222,11 +225,11 @@ main() fi dnl * @@ -67,7 +66,7 @@ AC_LINK_IFELSE([ #include #ifdef ENABLE_NLS -@@ -253,8 +259,8 @@ +@@ -253,8 +256,8 @@ main() try_nls=yes, try_nls=no) if test "$try_nls" = yes; then -- cgit v1.2.3