summaryrefslogtreecommitdiff
path: root/eclass
diff options
context:
space:
mode:
authorPatrick Lauer <patrick@gentoo.org>2012-10-19 02:44:21 +0000
committerPatrick Lauer <patrick@gentoo.org>2012-10-19 02:44:21 +0000
commit8bbde9f5b3766eeb09292bd1209cd709bc100836 (patch)
treefb46b60ccc519f6837e23aa4b530d044cf3844f7 /eclass
parentRestricting pypy (diff)
downloadgentoo-2-8bbde9f5b3766eeb09292bd1209cd709bc100836.tar.gz
gentoo-2-8bbde9f5b3766eeb09292bd1209cd709bc100836.tar.bz2
gentoo-2-8bbde9f5b3766eeb09292bd1209cd709bc100836.zip
Fixing binpkg behaviour
Diffstat (limited to 'eclass')
-rw-r--r--eclass/ChangeLog5
-rw-r--r--eclass/check-reqs.eclass4
2 files changed, 7 insertions, 2 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog
index 828842cc8c2b..2349d90332fd 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.451 2012/10/17 14:09:10 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.452 2012/10/19 02:44:21 patrick Exp $
+
+ 19 Oct 2012; Patrick Lauer <patrick@gentoo.org> check-reqs.eclass:
+ Fixing binpkg behaviour
17 Oct 2012; Michael Palimaka <kensington@gentoo.org> cmake-utils.eclass:
Respect AR and RANLIB, wrt bug #436070.
diff --git a/eclass/check-reqs.eclass b/eclass/check-reqs.eclass
index c739fd09ff61..f7644393df18 100644
--- a/eclass/check-reqs.eclass
+++ b/eclass/check-reqs.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/check-reqs.eclass,v 1.11 2012/09/27 16:35:41 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/check-reqs.eclass,v 1.12 2012/10/19 02:44:21 patrick Exp $
# @ECLASS: check-reqs.eclass
# @MAINTAINER:
@@ -91,6 +91,8 @@ check_reqs() {
check-reqs_pkg_setup() {
debug-print-function ${FUNCNAME} "$@"
+ [[ ${MERGE_TYPE} == binary ]] && return
+
check-reqs_prepare
check-reqs_run
check-reqs_output