summaryrefslogtreecommitdiff
path: root/eclass
diff options
context:
space:
mode:
authorFabian Groffen <grobian@gentoo.org>2012-06-05 18:31:54 +0000
committerFabian Groffen <grobian@gentoo.org>2012-06-05 18:31:54 +0000
commit492a4e8e0f1b5691a7b70dadf8a2139151139c33 (patch)
tree55b91e3aeeaba743840beddcffc84d1152e6be00 /eclass
parentInitial import (diff)
downloadgentoo-2-492a4e8e0f1b5691a7b70dadf8a2139151139c33.tar.gz
gentoo-2-492a4e8e0f1b5691a7b70dadf8a2139151139c33.tar.bz2
gentoo-2-492a4e8e0f1b5691a7b70dadf8a2139151139c33.zip
Avoid type -P output for glibtoolize, bug #419641
Diffstat (limited to 'eclass')
-rw-r--r--eclass/ChangeLog5
-rw-r--r--eclass/autotools.eclass4
2 files changed, 6 insertions, 3 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog
index 87c9ebce4d4a..bfe5ed3f0e80 100644
--- a/eclass/ChangeLog
+++ b/eclass/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.289 2012/06/05 17:40:12 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.290 2012/06/05 18:31:54 grobian Exp $
+
+ 05 Jun 2012; Fabian Groffen <grobian@gentoo.org> autotools.eclass:
+ Avoid type -P output for glibtoolize, bug #419641
05 Jun 2012; Julian Ospald <hasufell@gentoo.org> eutils.eclass:
enhanced functionality of doicon/newicon in eutils.eclass
diff --git a/eclass/autotools.eclass b/eclass/autotools.eclass
index 2d165e0def5a..4175730a0652 100644
--- a/eclass/autotools.eclass
+++ b/eclass/autotools.eclass
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.142 2012/05/24 01:13:32 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.143 2012/06/05 18:31:54 grobian Exp $
# @ECLASS: autotools.eclass
# @MAINTAINER:
@@ -276,7 +276,7 @@ eaclocal() {
# Note the '_' prefix .. to not collide with elibtoolize() from libtool.eclass.
_elibtoolize() {
local LIBTOOLIZE=${LIBTOOLIZE:-libtoolize}
- type -P glibtoolize && LIBTOOLIZE=glibtoolize
+ type -P glibtoolize > /dev/null && LIBTOOLIZE=glibtoolize
[[ -f GNUmakefile.am || -f Makefile.am ]] && set -- "$@" --automake
if [[ $1 == "--install" ]] ; then