Attachment #160556 for bug #202516

View | Details | Raw Unified | Return to bug 202516
Collapse All | Expand All

Lines 3-9 Link Here

(-)converters/libiconv/Makefile (-1 / +1 lines)
3		3
4	PORTNAME= libiconv	4	PORTNAME= libiconv
5	PORTVERSION= 1.14	5	PORTVERSION= 1.14
6	PORTREVISION= 8	6	PORTREVISION= 9
7	CATEGORIES= converters devel	7	CATEGORIES= converters devel
8	MASTER_SITES= GNU	8	MASTER_SITES= GNU
9		9

Lines 1-11 Link Here

(-)converters/libiconv/files/patch-lib-iconv.c (-11 lines)
1	--- lib/iconv.c.orig
2	+++ lib/iconv.c
3	@@ -598,7 +598,7 @@
4	It wants to define the symbols 'iconv_open', 'iconv', 'iconv_close'. */
5	#define strong_alias(name, aliasname) _strong_alias(name, aliasname)
6	#define _strong_alias(name, aliasname) \
7	- extern __typeof (name) aliasname __attribute__ ((alias (#name)));
8	+ extern LIBICONV_DLL_EXPORTED __typeof (name) aliasname __attribute__ ((alias (#name)));
9	#undef iconv_open
10	#undef iconv
11	#undef iconv_close

Lines 20-25 ICONV_LIB= -liconv Link Here

(-)Mk/Uses/iconv.mk (-1 / +10 lines)
20	ICONV_PREFIX= ${LOCALBASE}	20	ICONV_PREFIX= ${LOCALBASE}
21	ICONV_CONFIGURE_ARG= --with-libiconv-prefix=${LOCALBASE}	21	ICONV_CONFIGURE_ARG= --with-libiconv-prefix=${LOCALBASE}
22	ICONV_CONFIGURE_BASE= --with-libiconv=${LOCALBASE}	22	ICONV_CONFIGURE_BASE= --with-libiconv=${LOCALBASE}
		23	CMAKE_ARGS+= -DICONV_INCLUDE_DIR=${LOCALBASE}/include \
		24	-DLIBICONV_INCLUDE_DIR=${LOCALBASE}/include
23		25
24	.if ${iconv_ARGS:Mbuild}	26	.if ${iconv_ARGS:Mbuild}
25	BUILD_DEPENDS+= ${ICONV_CMD}:${PORTSDIR}/converters/libiconv	27	BUILD_DEPENDS+= ${ICONV_CMD}:${PORTSDIR}/converters/libiconv
Lines 40-50 ICONV_CONFIGURE_BASE= Link Here
40	.if ${OPSYS} == DragonFly \|\| (${OPSYS} == FreeBSD && (${OSVERSION} < 1001514 \	42	.if ${OPSYS} == DragonFly \|\| (${OPSYS} == FreeBSD && (${OSVERSION} < 1001514 \
41	\|\| (${OSVERSION} >= 1100000 && ${OSVERSION} < 1100069))) \	43	\|\| (${OSVERSION} >= 1100000 && ${OSVERSION} < 1100069))) \
42	\|\| exists(${LOCALBASE}/include/iconv.h)	44	\|\| exists(${LOCALBASE}/include/iconv.h)
43	BUILD_DEPENDS+= libiconv>=1.14_8:${PORTSDIR}/converters/libiconv	45	BUILD_DEPENDS+= libiconv>=1.14_9:${PORTSDIR}/converters/libiconv
44	CPPFLAGS+= -DLIBICONV_PLUG	46	CPPFLAGS+= -DLIBICONV_PLUG
45	CFLAGS+= -DLIBICONV_PLUG	47	CFLAGS+= -DLIBICONV_PLUG
46	CXXFLAGS+= -DLIBICONV_PLUG	48	CXXFLAGS+= -DLIBICONV_PLUG
47	OBJCFLAGS+= -DLIBICONV_PLUG	49	OBJCFLAGS+= -DLIBICONV_PLUG
		50	CMAKE_ARGS+= -DICONV_INCLUDE_DIR=${LOCALBASE}/include \
		51	-DICONV_LIBRARY=/usr/lib/libc.so \
		52	-DICONV_LIBRARIES=/usr/lib/libc.so \
		53	-DLIBICONV_INCLUDE_DIR=${LOCALBASE}/include \
		54	-DLIBICONV_LIBRARY=/usr/lib/libc.so \
		55	-DLIBICONV_LIBRARIES=/usr/lib/libc.so
		56
48	.endif	57	.endif
49		58
50	.endif	59	.endif

Return to bug 202516