From owner-svn-ports-all@FreeBSD.ORG Thu Apr 16 10:57:58 2015 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id AC903B3E; Thu, 16 Apr 2015 10:57:58 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 9750A7E2; Thu, 16 Apr 2015 10:57:58 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3GAvwih086685; Thu, 16 Apr 2015 10:57:58 GMT (envelope-from tijl@FreeBSD.org) Received: (from tijl@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3GAvv3i086682; Thu, 16 Apr 2015 10:57:57 GMT (envelope-from tijl@FreeBSD.org) Message-Id: <201504161057.t3GAvv3i086682@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: tijl set sender to tijl@FreeBSD.org using -f From: Tijl Coosemans Date: Thu, 16 Apr 2015 10:57:57 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r384096 - in head: Mk/Uses converters/libiconv converters/libiconv/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 16 Apr 2015 10:57:58 -0000 Author: tijl Date: Thu Apr 16 10:57:57 2015 New Revision: 384096 URL: https://svnweb.freebsd.org/changeset/ports/384096 Log: Hide _LIBICONV_VERSION when LIBICONV_PLUG is defined. This fixes building devel/gettext-runtime with gcc from lang/gcc*. With base system compiler gettext includes /usr/include/iconv.h but lang/gcc* implies -I/usr/local/include and gettext calls libiconv_set_relocation_prefix when it sees _LIBICONV_VERSION which isn't implemented (and isn't needed) by libc iconv. Reported by: Dewayne Geraghty Modified: head/Mk/Uses/iconv.mk head/converters/libiconv/Makefile head/converters/libiconv/files/patch-include-iconv.h.in Modified: head/Mk/Uses/iconv.mk ============================================================================== --- head/Mk/Uses/iconv.mk Thu Apr 16 10:57:54 2015 (r384095) +++ head/Mk/Uses/iconv.mk Thu Apr 16 10:57:57 2015 (r384096) @@ -39,7 +39,7 @@ ICONV_CONFIGURE_BASE= .if ${OPSYS} == DragonFly || (${OPSYS} == FreeBSD && ${OSVERSION} < 1100069) \ || exists(${LOCALBASE}/include/iconv.h) -BUILD_DEPENDS+= libiconv>=1.14_7:${PORTSDIR}/converters/libiconv +BUILD_DEPENDS+= libiconv>=1.14_8:${PORTSDIR}/converters/libiconv CPPFLAGS+= -DLIBICONV_PLUG CFLAGS+= -DLIBICONV_PLUG CXXFLAGS+= -DLIBICONV_PLUG Modified: head/converters/libiconv/Makefile ============================================================================== --- head/converters/libiconv/Makefile Thu Apr 16 10:57:54 2015 (r384095) +++ head/converters/libiconv/Makefile Thu Apr 16 10:57:57 2015 (r384096) @@ -3,7 +3,7 @@ PORTNAME= libiconv PORTVERSION= 1.14 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= converters devel MASTER_SITES= GNU Modified: head/converters/libiconv/files/patch-include-iconv.h.in ============================================================================== --- head/converters/libiconv/files/patch-include-iconv.h.in Thu Apr 16 10:57:54 2015 (r384095) +++ head/converters/libiconv/files/patch-include-iconv.h.in Thu Apr 16 10:57:57 2015 (r384096) @@ -1,6 +1,17 @@ --- include/iconv.h.in.orig 2011-08-07 17:48:03 UTC +++ include/iconv.h.in -@@ -94,7 +94,6 @@ extern int iconv_close (iconv_t cd); +@@ -21,8 +21,10 @@ + #ifndef _LIBICONV_H + #define _LIBICONV_H + ++#ifndef LIBICONV_PLUG + #define _LIBICONV_VERSION 0x010E /* version number: (major<<8) + minor */ + extern @DLL_VARIABLE@ int _libiconv_version; /* Likewise */ ++#endif + + /* We would like to #include any system header file which could define + iconv_t, 1. in order to eliminate the risk that the user gets compilation +@@ -94,7 +96,6 @@ extern int iconv_close (iconv_t cd); #endif @@ -8,7 +19,7 @@ /* Nonstandard extensions. */ -@@ -127,12 +126,16 @@ typedef struct { +@@ -127,12 +128,16 @@ typedef struct { /* Allocates descriptor for code conversion from encoding ‘fromcode’ to encoding ‘tocode’ into preallocated memory. Returns an error indicator (0 or -1 with errno set). */ @@ -25,7 +36,7 @@ extern int iconvctl (iconv_t cd, int request, void* argument); /* Hook performed after every successful conversion of a Unicode character. */ -@@ -212,7 +215,9 @@ struct iconv_fallbacks { +@@ -212,7 +217,9 @@ struct iconv_fallbacks { #define ICONV_SET_FALLBACKS 6 /* const struct iconv_fallbacks *argument */ /* Listing of locale independent encodings. */ @@ -35,7 +46,7 @@ extern void iconvlist (int (*do_one) (unsigned int namescount, const char * const * names, void* data), -@@ -224,6 +229,7 @@ extern const char * iconv_canonicalize ( +@@ -224,6 +231,7 @@ extern const char * iconv_canonicalize ( /* Support for relocatable packages. */ @@ -43,7 +54,7 @@ /* Sets the original and the current installation prefix of the package. Relocation simply replaces a pathname starting with the original prefix by the corresponding pathname with the current prefix instead. Both -@@ -231,12 +237,12 @@ extern const char * iconv_canonicalize ( +@@ -231,12 +239,12 @@ extern const char * iconv_canonicalize ( instead of "/"). */ extern void libiconv_set_relocation_prefix (const char *orig_prefix, const char *curr_prefix);