Date: Wed, 19 Feb 2014 18:40:01 GMT From: Tijl Coosemans <tijl@FreeBSD.org> To: gnome@FreeBSD.org Subject: Re: ports/186846: [patch] converters/libiconv: compilation with -Oz broken Message-ID: <201402191840.s1JIe1Pr057188@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/186846; it has been noted by GNATS. From: Tijl Coosemans <tijl@FreeBSD.org> To: bug-followup@FreeBSD.org Cc: Subject: Re: ports/186846: [patch] converters/libiconv: compilation with -Oz broken Date: Wed, 19 Feb 2014 19:32:28 +0100 --MP_/a1dP7fDT.6pF01Msx5erdEj Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Content-Disposition: inline Updated patch which adds a DOCS option and includes changes from http://www.freebsd.org/cgi/query-pr.cgi?pr=186590 --MP_/a1dP7fDT.6pF01Msx5erdEj Content-Type: text/x-patch Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=libiconv.patch Index: converters/libiconv/Makefile =================================================================== --- converters/libiconv/Makefile (revision 345014) +++ converters/libiconv/Makefile (working copy) @@ -3,24 +3,24 @@ PORTNAME= libiconv PORTVERSION= 1.14 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= converters devel MASTER_SITES= GNU MAINTAINER= gnome@FreeBSD.org -COMMENT= A character set conversion library +COMMENT= Character set conversion library GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-static \ --without-libintl-prefix \ --docdir=${DOCSDIR} -CONFIGURE_ENV= gl_cv_cc_visibility="no" \ - am_cv_func_iconv="yes" \ +CONFIGURE_ENV= am_cv_func_iconv="yes" \ am_cv_proto_iconv_arg1="const" MAKE_JOBS_UNSAFE= yes +USE_CSTD= gnu89 USE_LDCONFIG= yes -OPTIONS_DEFINE= ENCODINGS PATCHES +OPTIONS_DEFINE= DOCS ENCODINGS PATCHES OPTIONS_DEFAULT=ENCODINGS ENCODINGS_DESC= Include extra character sets PATCHES_DESC= Apply patches to fix CP932, add EUCJP-MS Index: converters/libiconv/files/patch-lib-iconv.c =================================================================== --- converters/libiconv/files/patch-lib-iconv.c (revision 0) +++ converters/libiconv/files/patch-lib-iconv.c (working copy) @@ -0,0 +1,11 @@ +--- lib/iconv.c.orig ++++ lib/iconv.c +@@ -598,7 +598,7 @@ + It wants to define the symbols 'iconv_open', 'iconv', 'iconv_close'. */ + #define strong_alias(name, aliasname) _strong_alias(name, aliasname) + #define _strong_alias(name, aliasname) \ +- extern __typeof (name) aliasname __attribute__ ((alias (#name))); ++ extern LIBICONV_DLL_EXPORTED __typeof (name) aliasname __attribute__ ((alias (#name))); + #undef iconv_open + #undef iconv + #undef iconv_close Property changes on: converters/libiconv/files/patch-lib-iconv.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: converters/libiconv/pkg-plist =================================================================== --- converters/libiconv/pkg-plist (revision 345014) +++ converters/libiconv/pkg-plist (working copy) @@ -17,10 +17,10 @@ man/man3/iconv_open.3.gz man/man3/iconv_open_into.3.gz man/man3/iconv_close.3.gz man/man3/iconvctl.3.gz -%%DOCSDIR%%/iconv.1.html -%%DOCSDIR%%/iconv.3.html -%%DOCSDIR%%/iconv_close.3.html -%%DOCSDIR%%/iconv_open.3.html -%%DOCSDIR%%/iconv_open_into.3.html -%%DOCSDIR%%/iconvctl.3.html -@dirrm %%DOCSDIR%% +%%PORTDOCS%%%%DOCSDIR%%/iconv.1.html +%%PORTDOCS%%%%DOCSDIR%%/iconv.3.html +%%PORTDOCS%%%%DOCSDIR%%/iconv_close.3.html +%%PORTDOCS%%%%DOCSDIR%%/iconv_open.3.html +%%PORTDOCS%%%%DOCSDIR%%/iconv_open_into.3.html +%%PORTDOCS%%%%DOCSDIR%%/iconvctl.3.html +%%PORTDOCS%%@dirrm %%DOCSDIR%% --MP_/a1dP7fDT.6pF01Msx5erdEj--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201402191840.s1JIe1Pr057188>