summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2014-06-15 00:59:17 +0000
committerMike Frysinger <vapier@gentoo.org>2014-06-15 00:59:17 +0000
commit98c02e4b7c43a7aab203f3e155e1e59282f1eb42 (patch)
treee638a6c18444cc9be7a32e625388cc378cea3d53 /media-libs/gd
parentAdd arm64 love. (diff)
downloadgentoo-2-98c02e4b7c43a7aab203f3e155e1e59282f1eb42.tar.gz
gentoo-2-98c02e4b7c43a7aab203f3e155e1e59282f1eb42.tar.bz2
gentoo-2-98c02e4b7c43a7aab203f3e155e1e59282f1eb42.zip
Make sure @LIBICONV@ is replaced when nls is unavailable #512942 by Ulrich Müller.
Diffstat (limited to 'media-libs/gd')
-rw-r--r--media-libs/gd/ChangeLog6
-rw-r--r--media-libs/gd/gd-2.0.35-r4.ebuild4
2 files changed, 7 insertions, 3 deletions
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 <vapier@gentoo.org> 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