| 1 |
vapier 09/08/26 21:47:56 |
| 2 |
|
| 3 |
Modified: eutils.eclass toolchain.eclass |
| 4 |
toolchain-binutils.eclass |
| 5 |
Log: |
| 6 |
unify duplicated user epatching code |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.318 eclass/eutils.eclass |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/eutils.eclass?rev=1.318&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/eutils.eclass?rev=1.318&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/eutils.eclass?r1=1.317&r2=1.318 |
| 14 |
|
| 15 |
Index: eutils.eclass |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v |
| 18 |
retrieving revision 1.317 |
| 19 |
retrieving revision 1.318 |
| 20 |
diff -u -r1.317 -r1.318 |
| 21 |
--- eutils.eclass 1 Mar 2009 08:06:00 -0000 1.317 |
| 22 |
+++ eutils.eclass 26 Aug 2009 21:47:56 -0000 1.318 |
| 23 |
@@ -1,6 +1,6 @@ |
| 24 |
# Copyright 1999-2007 Gentoo Foundation |
| 25 |
# Distributed under the terms of the GNU General Public License v2 |
| 26 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.317 2009/03/01 08:06:00 vapier Exp $ |
| 27 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.318 2009/08/26 21:47:56 vapier Exp $ |
| 28 |
|
| 29 |
# @ECLASS: eutils.eclass |
| 30 |
# @MAINTAINER: |
| 31 |
@@ -349,6 +349,25 @@ |
| 32 |
einfo "Done with patching" |
| 33 |
fi |
| 34 |
} |
| 35 |
+epatch_user() { |
| 36 |
+ [[ $# -ne 0 ]] && die "epatch_user takes no options" |
| 37 |
+ |
| 38 |
+ # don't clobber any EPATCH vars that the parent might want |
| 39 |
+ local EPATCH_SOURCE check base=${PORTAGE_CONFIGROOT}/etc/portage/patches |
| 40 |
+ for check in {${CATEGORY}/${PF},${CATEGORY}/${P},${CATEGORY}/${PN}}; do |
| 41 |
+ EPATCH_SOURCE=${base}/${CTARGET}/${check} |
| 42 |
+ [[ -r ${EPATCH_SOURCE} ]] || EPATCH_SOURCE=${base}/${CHOST}/${check} |
| 43 |
+ [[ -r ${EPATCH_SOURCE} ]] || EPATCH_SOURCE=${base}/${check} |
| 44 |
+ if [[ -d ${EPATCH_SOURCE} ]] ; then |
| 45 |
+ EPATCH_SOURCE=${EPATCH_SOURCE} \ |
| 46 |
+ EPATCH_SUFFIX="patch" \ |
| 47 |
+ EPATCH_FORCE="yes" \ |
| 48 |
+ EPATCH_MULTI_MSG="Applying user patches from ${EPATCH_SOURCE} ..." \ |
| 49 |
+ epatch |
| 50 |
+ break |
| 51 |
+ fi |
| 52 |
+ done |
| 53 |
+} |
| 54 |
|
| 55 |
# @FUNCTION: emktemp |
| 56 |
# @USAGE: [temp dir] |
| 57 |
|
| 58 |
|
| 59 |
|
| 60 |
1.406 eclass/toolchain.eclass |
| 61 |
|
| 62 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.406&view=markup |
| 63 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.406&content-type=text/plain |
| 64 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?r1=1.405&r2=1.406 |
| 65 |
|
| 66 |
Index: toolchain.eclass |
| 67 |
=================================================================== |
| 68 |
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v |
| 69 |
retrieving revision 1.405 |
| 70 |
retrieving revision 1.406 |
| 71 |
diff -u -r1.405 -r1.406 |
| 72 |
--- toolchain.eclass 16 Aug 2009 00:16:12 -0000 1.405 |
| 73 |
+++ toolchain.eclass 26 Aug 2009 21:47:56 -0000 1.406 |
| 74 |
@@ -1,6 +1,6 @@ |
| 75 |
# Copyright 1999-2008 Gentoo Foundation |
| 76 |
# Distributed under the terms of the GNU General Public License v2 |
| 77 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.405 2009/08/16 00:16:12 vapier Exp $ |
| 78 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.406 2009/08/26 21:47:56 vapier Exp $ |
| 79 |
# |
| 80 |
# Maintainer: Toolchain Ninjas <toolchain@g.o> |
| 81 |
|
| 82 |
@@ -1085,7 +1085,7 @@ |
| 83 |
do_gcc_HTB_patches |
| 84 |
do_gcc_SSP_patches |
| 85 |
do_gcc_PIE_patches |
| 86 |
- do_gcc_USER_patches |
| 87 |
+ epatch_user |
| 88 |
|
| 89 |
${ETYPE}_src_unpack || die "failed to ${ETYPE}_src_unpack" |
| 90 |
|
| 91 |
@@ -2103,22 +2103,6 @@ |
| 92 |
done |
| 93 |
} |
| 94 |
|
| 95 |
-do_gcc_USER_patches() { |
| 96 |
- local check base=${PORTAGE_CONFIGROOT}/etc/portage/patches |
| 97 |
- for check in {${CATEGORY}/${PF},${CATEGORY}/${P},${CATEGORY}/${PN}}; do |
| 98 |
- EPATCH_SOURCE=${base}/${CTARGET}/${check} |
| 99 |
- [[ -r ${EPATCH_SOURCE} ]] || EPATCH_SOURCE=${base}/${CHOST}/${check} |
| 100 |
- [[ -r ${EPATCH_SOURCE} ]] || EPATCH_SOURCE=${base}/${check} |
| 101 |
- if [[ -d ${EPATCH_SOURCE} ]] ; then |
| 102 |
- EPATCH_SUFFIX="patch" |
| 103 |
- EPATCH_FORCE="yes" \ |
| 104 |
- EPATCH_MULTI_MSG="Applying user patches from ${EPATCH_SOURCE} ..." \ |
| 105 |
- epatch |
| 106 |
- break |
| 107 |
- fi |
| 108 |
- done |
| 109 |
-} |
| 110 |
- |
| 111 |
do_gcc_HTB_patches() { |
| 112 |
if ! want_boundschecking || \ |
| 113 |
(want_ssp && [[ ${HTB_EXCLUSIVE} == "true" ]]) |
| 114 |
|
| 115 |
|
| 116 |
|
| 117 |
1.84 eclass/toolchain-binutils.eclass |
| 118 |
|
| 119 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain-binutils.eclass?rev=1.84&view=markup |
| 120 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain-binutils.eclass?rev=1.84&content-type=text/plain |
| 121 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain-binutils.eclass?r1=1.83&r2=1.84 |
| 122 |
|
| 123 |
Index: toolchain-binutils.eclass |
| 124 |
=================================================================== |
| 125 |
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain-binutils.eclass,v |
| 126 |
retrieving revision 1.83 |
| 127 |
retrieving revision 1.84 |
| 128 |
diff -u -r1.83 -r1.84 |
| 129 |
--- toolchain-binutils.eclass 23 May 2009 23:07:28 -0000 1.83 |
| 130 |
+++ toolchain-binutils.eclass 26 Aug 2009 21:47:56 -0000 1.84 |
| 131 |
@@ -1,6 +1,6 @@ |
| 132 |
# Copyright 1999-2009 Gentoo Foundation |
| 133 |
# Distributed under the terms of the GNU General Public License v2 |
| 134 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain-binutils.eclass,v 1.83 2009/05/23 23:07:28 vapier Exp $ |
| 135 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain-binutils.eclass,v 1.84 2009/08/26 21:47:56 vapier Exp $ |
| 136 |
# |
| 137 |
# Maintainer: Toolchain Ninjas <toolchain@g.o> |
| 138 |
# |
| 139 |
@@ -138,19 +138,7 @@ |
| 140 |
die "sorry, but this binutils doesn't yet support uClibc :(" |
| 141 |
fi |
| 142 |
fi |
| 143 |
- local check base=${PORTAGE_CONFIGROOT}/etc/portage/patches |
| 144 |
- for check in {${CATEGORY}/${PF},${CATEGORY}/${P},${CATEGORY}/${PN}}; do |
| 145 |
- EPATCH_SOURCE=${base}/${CTARGET}/${check} |
| 146 |
- [[ -r ${EPATCH_SOURCE} ]] || EPATCH_SOURCE=${base}/${CHOST}/${check} |
| 147 |
- [[ -r ${EPATCH_SOURCE} ]] || EPATCH_SOURCE=${base}/${check} |
| 148 |
- if [[ -d ${EPATCH_SOURCE} ]] ; then |
| 149 |
- EPATCH_SUFFIX="patch" |
| 150 |
- EPATCH_FORCE="yes" \ |
| 151 |
- EPATCH_MULTI_MSG="Applying user patches from ${EPATCH_SOURCE} ..." \ |
| 152 |
- epatch |
| 153 |
- break |
| 154 |
- fi |
| 155 |
- done |
| 156 |
+ epatch_user |
| 157 |
fi |
| 158 |
|
| 159 |
# fix locale issues if possible #122216 |
Archives