1 |
scarabeus 09/04/08 16:46:34 |
2 |
|
3 |
Modified: git.eclass |
4 |
Log: |
5 |
Apply patches from PATCHES variable too in git eclass. Now it was applying only EGIT_PATCHES. |
6 |
|
7 |
Revision Changes Path |
8 |
1.22 eclass/git.eclass |
9 |
|
10 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/git.eclass?rev=1.22&view=markup |
11 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/git.eclass?rev=1.22&content-type=text/plain |
12 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/git.eclass?r1=1.21&r2=1.22 |
13 |
|
14 |
Index: git.eclass |
15 |
=================================================================== |
16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/git.eclass,v |
17 |
retrieving revision 1.21 |
18 |
retrieving revision 1.22 |
19 |
diff -u -r1.21 -r1.22 |
20 |
--- git.eclass 7 Apr 2009 15:03:32 -0000 1.21 |
21 |
+++ git.eclass 8 Apr 2009 16:46:34 -0000 1.22 |
22 |
@@ -1,6 +1,6 @@ |
23 |
# Copyright 1999-2009 Gentoo Foundation |
24 |
# Distributed under the terms of the GNU General Public License v2 |
25 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/git.eclass,v 1.21 2009/04/07 15:03:32 scarabeus Exp $ |
26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/git.eclass,v 1.22 2009/04/08 16:46:34 scarabeus Exp $ |
27 |
|
28 |
# @ECLASS: git.eclass |
29 |
# @MAINTAINER: |
30 |
@@ -14,7 +14,7 @@ |
31 |
# @THANKS TO: |
32 |
# Fernando J. Pereda <ferdy@g.o> |
33 |
|
34 |
-inherit eutils |
35 |
+inherit eutils base |
36 |
|
37 |
EGIT="git.eclass" |
38 |
|
39 |
@@ -334,7 +334,10 @@ |
40 |
# src_prepare function for git stuff. Patches, bootstrap... |
41 |
git_src_prepare() { |
42 |
debug-print-function ${FUNCNAME} "$@" |
43 |
- |
44 |
+ |
45 |
+ # apply EGIT_PATCHES |
46 |
git_apply_patches |
47 |
+ # apply patches from PATCHES array too |
48 |
+ base_src_prepare |
49 |
git_bootstrap |
50 |
} |