| 1 |
mgorny 14/04/29 20:59:00 |
| 2 |
|
| 3 |
Modified: ChangeLog multilib-build.eclass |
| 4 |
Log: |
| 5 |
Reorder the operations in multilib_prepare_wrappers for easier reading. |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.1231 eclass/ChangeLog |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1231&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1231&content-type=text/plain |
| 12 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1230&r2=1.1231 |
| 13 |
|
| 14 |
Index: ChangeLog |
| 15 |
=================================================================== |
| 16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v |
| 17 |
retrieving revision 1.1230 |
| 18 |
retrieving revision 1.1231 |
| 19 |
diff -u -r1.1230 -r1.1231 |
| 20 |
--- ChangeLog 29 Apr 2014 20:57:28 -0000 1.1230 |
| 21 |
+++ ChangeLog 29 Apr 2014 20:59:00 -0000 1.1231 |
| 22 |
@@ -1,6 +1,9 @@ |
| 23 |
# ChangeLog for eclass directory |
| 24 |
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
| 25 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1230 2014/04/29 20:57:28 mgorny Exp $ |
| 26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1231 2014/04/29 20:59:00 mgorny Exp $ |
| 27 |
+ |
| 28 |
+ 29 Apr 2014; Michał Górny <mgorny@g.o> multilib-build.eclass: |
| 29 |
+ Reorder the operations in multilib_prepare_wrappers for easier reading. |
| 30 |
|
| 31 |
29 Apr 2014; Michał Górny <mgorny@g.o> multilib-build.eclass: |
| 32 |
Create ${CHOST}-prefixed tool symlinks for multilib portage, to gain better |
| 33 |
|
| 34 |
|
| 35 |
|
| 36 |
1.44 eclass/multilib-build.eclass |
| 37 |
|
| 38 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?rev=1.44&view=markup |
| 39 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?rev=1.44&content-type=text/plain |
| 40 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?r1=1.43&r2=1.44 |
| 41 |
|
| 42 |
Index: multilib-build.eclass |
| 43 |
=================================================================== |
| 44 |
RCS file: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v |
| 45 |
retrieving revision 1.43 |
| 46 |
retrieving revision 1.44 |
| 47 |
diff -u -r1.43 -r1.44 |
| 48 |
--- multilib-build.eclass 29 Apr 2014 20:57:28 -0000 1.43 |
| 49 |
+++ multilib-build.eclass 29 Apr 2014 20:59:00 -0000 1.44 |
| 50 |
@@ -1,6 +1,6 @@ |
| 51 |
# Copyright 1999-2014 Gentoo Foundation |
| 52 |
# Distributed under the terms of the GNU General Public License v2 |
| 53 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v 1.43 2014/04/29 20:57:28 mgorny Exp $ |
| 54 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v 1.44 2014/04/29 20:59:00 mgorny Exp $ |
| 55 |
|
| 56 |
# @ECLASS: multilib-build.eclass |
| 57 |
# @MAINTAINER: |
| 58 |
@@ -315,6 +315,33 @@ |
| 59 |
return |
| 60 |
fi |
| 61 |
|
| 62 |
+ for f in "${MULTILIB_CHOST_TOOLS[@]}"; do |
| 63 |
+ # drop leading slash if it's there |
| 64 |
+ f=${f#/} |
| 65 |
+ |
| 66 |
+ local dir=${f%/*} |
| 67 |
+ local fn=${f##*/} |
| 68 |
+ |
| 69 |
+ if [[ -L ${root}/${f} ]]; then |
| 70 |
+ # rewrite the symlink target |
| 71 |
+ local target=$(readlink "${root}/${f}") |
| 72 |
+ local target_dir |
| 73 |
+ local target_fn=${target##*/} |
| 74 |
+ |
| 75 |
+ [[ ${target} == */* ]] && target_dir=${target%/*} |
| 76 |
+ |
| 77 |
+ ln -f -s "${target_dir+${target_dir}/}${CHOST}-${target_fn}" \ |
| 78 |
+ "${root}/${f}" || die |
| 79 |
+ fi |
| 80 |
+ |
| 81 |
+ mv "${root}/${f}" "${root}/${dir}/${CHOST}-${fn}" || die |
| 82 |
+ |
| 83 |
+ # symlink the native one back |
| 84 |
+ if multilib_is_native_abi; then |
| 85 |
+ ln -s "${CHOST}-${fn}" "${root}/${f}" || die |
| 86 |
+ fi |
| 87 |
+ done |
| 88 |
+ |
| 89 |
for f in "${MULTILIB_WRAPPED_HEADERS[@]}"; do |
| 90 |
# drop leading slash if it's there |
| 91 |
f=${f#/} |
| 92 |
@@ -388,33 +415,6 @@ |
| 93 |
-i "${ED}/tmp/multilib-include${f}" || die |
| 94 |
fi |
| 95 |
done |
| 96 |
- |
| 97 |
- for f in "${MULTILIB_CHOST_TOOLS[@]}"; do |
| 98 |
- # drop leading slash if it's there |
| 99 |
- f=${f#/} |
| 100 |
- |
| 101 |
- local dir=${f%/*} |
| 102 |
- local fn=${f##*/} |
| 103 |
- |
| 104 |
- if [[ -L ${root}/${f} ]]; then |
| 105 |
- # rewrite the symlink target |
| 106 |
- local target=$(readlink "${root}/${f}") |
| 107 |
- local target_dir |
| 108 |
- local target_fn=${target##*/} |
| 109 |
- |
| 110 |
- [[ ${target} == */* ]] && target_dir=${target%/*} |
| 111 |
- |
| 112 |
- ln -f -s "${target_dir+${target_dir}/}${CHOST}-${target_fn}" \ |
| 113 |
- "${root}/${f}" || die |
| 114 |
- fi |
| 115 |
- |
| 116 |
- mv "${root}/${f}" "${root}/${dir}/${CHOST}-${fn}" || die |
| 117 |
- |
| 118 |
- # symlink the native one back |
| 119 |
- if multilib_is_native_abi; then |
| 120 |
- ln -s "${CHOST}-${fn}" "${root}/${f}" || die |
| 121 |
- fi |
| 122 |
- done |
| 123 |
} |
| 124 |
|
| 125 |
# @FUNCTION: multilib_install_wrappers |
Archives