| 1 |
mgorny 12/10/29 09:49:54 |
| 2 |
|
| 3 |
Modified: ChangeLog distutils-r1.eclass |
| 4 |
Log: |
| 5 |
Use find instead of hard-coded executable locations list when linking the wrapper. |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.479 eclass/ChangeLog |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.479&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.479&content-type=text/plain |
| 12 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.478&r2=1.479 |
| 13 |
|
| 14 |
Index: ChangeLog |
| 15 |
=================================================================== |
| 16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v |
| 17 |
retrieving revision 1.478 |
| 18 |
retrieving revision 1.479 |
| 19 |
diff -u -r1.478 -r1.479 |
| 20 |
--- ChangeLog 29 Oct 2012 09:47:41 -0000 1.478 |
| 21 |
+++ ChangeLog 29 Oct 2012 09:49:54 -0000 1.479 |
| 22 |
@@ -1,6 +1,10 @@ |
| 23 |
# ChangeLog for eclass directory |
| 24 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
| 25 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.478 2012/10/29 09:47:41 mgorny Exp $ |
| 26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.479 2012/10/29 09:49:54 mgorny Exp $ |
| 27 |
+ |
| 28 |
+ 29 Oct 2012; Michał Górny <mgorny@g.o> distutils-r1.eclass: |
| 29 |
+ Use find instead of hard-coded executable locations list when linking the |
| 30 |
+ wrapper. |
| 31 |
|
| 32 |
29 Oct 2012; Michał Górny <mgorny@g.o> distutils-r1.eclass: |
| 33 |
Use new python-r1 functions. |
| 34 |
|
| 35 |
|
| 36 |
|
| 37 |
1.10 eclass/distutils-r1.eclass |
| 38 |
|
| 39 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/distutils-r1.eclass?rev=1.10&view=markup |
| 40 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/distutils-r1.eclass?rev=1.10&content-type=text/plain |
| 41 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/distutils-r1.eclass?r1=1.9&r2=1.10 |
| 42 |
|
| 43 |
Index: distutils-r1.eclass |
| 44 |
=================================================================== |
| 45 |
RCS file: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v |
| 46 |
retrieving revision 1.9 |
| 47 |
retrieving revision 1.10 |
| 48 |
diff -u -r1.9 -r1.10 |
| 49 |
--- distutils-r1.eclass 29 Oct 2012 09:47:41 -0000 1.9 |
| 50 |
+++ distutils-r1.eclass 29 Oct 2012 09:49:54 -0000 1.10 |
| 51 |
@@ -1,6 +1,6 @@ |
| 52 |
# Copyright 1999-2012 Gentoo Foundation |
| 53 |
# Distributed under the terms of the GNU General Public License v2 |
| 54 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v 1.9 2012/10/29 09:47:41 mgorny Exp $ |
| 55 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v 1.10 2012/10/29 09:49:54 mgorny Exp $ |
| 56 |
|
| 57 |
# @ECLASS: distutils-r1 |
| 58 |
# @MAINTAINER: |
| 59 |
@@ -256,15 +256,14 @@ |
| 60 |
local EPYTHON |
| 61 |
python_export_best EPYTHON |
| 62 |
|
| 63 |
- for f in "${D}"/{bin,sbin,usr/bin,usr/sbin,games/bin}/*-"${EPYTHON}"; do |
| 64 |
- if [[ -x ${f} ]]; then |
| 65 |
- debug-print "${FUNCNAME}: found executable at ${f#${D}/}" |
| 66 |
+ local f |
| 67 |
+ while IFS= read -r -d '' f; do |
| 68 |
+ debug-print "${FUNCNAME}: found executable at ${f#${D}/}" |
| 69 |
|
| 70 |
- local wrapf=${f%-${EPYTHON}} |
| 71 |
+ local wrapf=${f%-${EPYTHON}} |
| 72 |
|
| 73 |
- _python_ln_rel "${ED}"/usr/bin/python-exec "${wrapf}" || die |
| 74 |
- fi |
| 75 |
- done |
| 76 |
+ _python_ln_rel "${ED}"/usr/bin/python-exec "${wrapf}" || die |
| 77 |
+ done < <(find "${D}" -type f -executable -name "*-${EPYTHON}" -print0) |
| 78 |
} |
| 79 |
|
| 80 |
# @FUNCTION: distutils-r1_run_phase |
Archives