From 2673713d9727b0f01bba0aa920c8f445f81dc8d6 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Sun, 15 Jun 2014 00:59:17 +0000 Subject: Make sure @LIBICONV@ is replaced when nls is unavailable #512942 by Ulrich Müller. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- media-libs/gd/ChangeLog | 6 +++++- media-libs/gd/gd-2.0.35-r4.ebuild | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) (limited to 'media-libs/gd') diff --git a/media-libs/gd/ChangeLog b/media-libs/gd/ChangeLog index cc83a679891c..0743eb6ebf31 100644 --- a/media-libs/gd/ChangeLog +++ b/media-libs/gd/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-libs/gd # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/gd/ChangeLog,v 1.89 2014/05/21 18:39:27 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/gd/ChangeLog,v 1.90 2014/06/15 00:59:17 vapier Exp $ + + 15 Jun 2014; Mike Frysinger gd-2.0.35-r4.ebuild: + Make sure @LIBICONV@ is replaced when nls is unavailable #512942 by Ulrich + Müller. *gd-2.0.35-r4 (21 May 2014) diff --git a/media-libs/gd/gd-2.0.35-r4.ebuild b/media-libs/gd/gd-2.0.35-r4.ebuild index 94e790c4e1f6..bd3ac5580ab2 100644 --- a/media-libs/gd/gd-2.0.35-r4.ebuild +++ b/media-libs/gd/gd-2.0.35-r4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/gd/gd-2.0.35-r4.ebuild,v 1.1 2014/05/21 18:39:27 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/gd/gd-2.0.35-r4.ebuild,v 1.2 2014/06/15 00:59:17 vapier Exp $ EAPI="5" @@ -44,7 +44,7 @@ src_prepare() { sed -i 's/AM_PROG_CC_STDC/AC_PROG_CC/' configure.ac || die cat <<-EOF > acinclude.m4 - m4_ifndef([AM_ICONV],[m4_define([AM_ICONV],[:])]) + m4_ifndef([AM_ICONV],[m4_define([AM_ICONV],[AC_SUBST(LIBICONV)])]) EOF eautoreconf -- cgit v1.2.3-65-gdbad