From owner-svn-ports-head@freebsd.org  Thu May 12 13:36:47 2016
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 77D3BB362F0;
 Thu, 12 May 2016 13:36:47 +0000 (UTC)
 (envelope-from tijl@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 48A7914EE;
 Thu, 12 May 2016 13:36:47 +0000 (UTC)
 (envelope-from tijl@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u4CDak4g017973;
 Thu, 12 May 2016 13:36:46 GMT (envelope-from tijl@FreeBSD.org)
Received: (from tijl@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4CDak16017972;
 Thu, 12 May 2016 13:36:46 GMT (envelope-from tijl@FreeBSD.org)
Message-Id: <201605121336.u4CDak16017972@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: tijl set sender to
 tijl@FreeBSD.org using -f
From: Tijl Coosemans <tijl@FreeBSD.org>
Date: Thu, 12 May 2016 13:36:46 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r415064 - head/Mk/Uses
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.22
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 12 May 2016 13:36:47 -0000

Author: tijl
Date: Thu May 12 13:36:46 2016
New Revision: 415064
URL: https://svnweb.freebsd.org/changeset/ports/415064

Log:
  Always add -DLIBICONV_PLUG to CPPFLAGS and friends when the base system
  iconv(3) is used.  Adding it only when LOCALBASE/include/iconv.h exists is
  not enough because this is tested before dependencies are installed and
  they may pull in converters/libiconv.
  
  PR:		209302
  Exp-run by:	antoine
  Approved by:	portmgr (antoine)

Modified:
  head/Mk/Uses/iconv.mk

Modified: head/Mk/Uses/iconv.mk
==============================================================================
--- head/Mk/Uses/iconv.mk	Thu May 12 13:13:36 2016	(r415063)
+++ head/Mk/Uses/iconv.mk	Thu May 12 13:36:46 2016	(r415064)
@@ -45,12 +45,13 @@ ICONV_LIB_PATH=		/usr/lib/libc.so
  || (${OSVERSION} >= 1100000 && ${OSVERSION} < 1100069))) \
  || exists(${LOCALBASE}/include/iconv.h)
 BUILD_DEPENDS+=	libiconv>=1.14_9:converters/libiconv
+ICONV_INCLUDE_PATH=	${LOCALBASE}/include
+.endif
+
 CPPFLAGS+=	-DLIBICONV_PLUG
 CFLAGS+=	-DLIBICONV_PLUG
 CXXFLAGS+=	-DLIBICONV_PLUG
 OBJCFLAGS+=	-DLIBICONV_PLUG
-ICONV_INCLUDE_PATH=	${LOCALBASE}/include
-.endif
 
 .endif