summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Chvatal <scarabeus@gentoo.org>2009-04-08 16:46:34 +0000
committerTomas Chvatal <scarabeus@gentoo.org>2009-04-08 16:46:34 +0000
commit26507b8379fceffc9eaa8d8e9c7aa8ef2b08a2e3 (patch)
tree4292c2459c413cb31766ed67ce389318a8672627 /eclass/git.eclass
parentFix hang reported in #263379 (diff)
downloadgentoo-2-26507b8379fceffc9eaa8d8e9c7aa8ef2b08a2e3.tar.gz
gentoo-2-26507b8379fceffc9eaa8d8e9c7aa8ef2b08a2e3.tar.bz2
gentoo-2-26507b8379fceffc9eaa8d8e9c7aa8ef2b08a2e3.zip
Apply patches from PATCHES variable too in git eclass. Now it was applying only EGIT_PATCHES.
Diffstat (limited to 'eclass/git.eclass')
-rw-r--r--eclass/git.eclass9
1 files changed, 6 insertions, 3 deletions
diff --git a/eclass/git.eclass b/eclass/git.eclass
index 37c8f49a8f53..42b7fae09d3c 100644
--- a/eclass/git.eclass
+++ b/eclass/git.eclass
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/git.eclass,v 1.21 2009/04/07 15:03:32 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/git.eclass,v 1.22 2009/04/08 16:46:34 scarabeus Exp $
# @ECLASS: git.eclass
# @MAINTAINER:
@@ -14,7 +14,7 @@
# @THANKS TO:
# Fernando J. Pereda <ferdy@gentoo.org>
-inherit eutils
+inherit eutils base
EGIT="git.eclass"
@@ -334,7 +334,10 @@ git_src_unpack() {
# src_prepare function for git stuff. Patches, bootstrap...
git_src_prepare() {
debug-print-function ${FUNCNAME} "$@"
-
+
+ # apply EGIT_PATCHES
git_apply_patches
+ # apply patches from PATCHES array too
+ base_src_prepare
git_bootstrap
}