Attachment 160556 Details for Bug 202516 – patch for converters/libiconv and Mk/Uses/iconv.mk

[patch] patch for converters/libiconv and Mk/Uses/iconv.mk

libiconv.patch (text/plain), 2.32 KB, created by Tijl Coosemans on 2015-08-31 10:50:29 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tijl Coosemans

Created: 2015-08-31 10:50:29 UTC

Size: 2.32 KB

patch

obsolete

>Index: converters/libiconv/Makefile
>===================================================================
>--- converters/libiconv/Makefile	(revision 394290)
>+++ converters/libiconv/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	libiconv
> PORTVERSION=	1.14
>-PORTREVISION=	8
>+PORTREVISION=	9
> CATEGORIES=	converters devel
> MASTER_SITES=	GNU
> 
>Index: converters/libiconv/files/patch-lib-iconv.c
>===================================================================
>--- converters/libiconv/files/patch-lib-iconv.c	(revision 394290)
>+++ converters/libiconv/files/patch-lib-iconv.c	(working copy)
>@@ -1,11 +0,0 @@
>---- 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
>Index: Mk/Uses/iconv.mk
>===================================================================
>--- Mk/Uses/iconv.mk	(revision 394290)
>+++ Mk/Uses/iconv.mk	(working copy)
>@@ -20,6 +20,8 @@ ICONV_LIB=	-liconv
> ICONV_PREFIX=	${LOCALBASE}
> ICONV_CONFIGURE_ARG=	--with-libiconv-prefix=${LOCALBASE}
> ICONV_CONFIGURE_BASE=	--with-libiconv=${LOCALBASE}
>+CMAKE_ARGS+=	-DICONV_INCLUDE_DIR=${LOCALBASE}/include \
>+		-DLIBICONV_INCLUDE_DIR=${LOCALBASE}/include
> 
> .if ${iconv_ARGS:Mbuild}
> BUILD_DEPENDS+=	${ICONV_CMD}:${PORTSDIR}/converters/libiconv
>@@ -40,11 +42,18 @@ ICONV_CONFIGURE_BASE=
> .if ${OPSYS} == DragonFly || (${OPSYS} == FreeBSD && (${OSVERSION} < 1001514 \
>  || (${OSVERSION} >= 1100000 && ${OSVERSION} < 1100069))) \
>  || exists(${LOCALBASE}/include/iconv.h)
>-BUILD_DEPENDS+=	libiconv>=1.14_8:${PORTSDIR}/converters/libiconv
>+BUILD_DEPENDS+=	libiconv>=1.14_9:${PORTSDIR}/converters/libiconv
> CPPFLAGS+=	-DLIBICONV_PLUG
> CFLAGS+=	-DLIBICONV_PLUG
> CXXFLAGS+=	-DLIBICONV_PLUG
> OBJCFLAGS+=	-DLIBICONV_PLUG
>+CMAKE_ARGS+=	-DICONV_INCLUDE_DIR=${LOCALBASE}/include \
>+		-DICONV_LIBRARY=/usr/lib/libc.so \
>+		-DICONV_LIBRARIES=/usr/lib/libc.so \
>+		-DLIBICONV_INCLUDE_DIR=${LOCALBASE}/include \
>+		-DLIBICONV_LIBRARY=/usr/lib/libc.so \
>+		-DLIBICONV_LIBRARIES=/usr/lib/libc.so
>+		
> .endif
> 
> .endif

Actions: View | Diff

Attachments on bug 202516: 160556