| 1 |
mgorny 14/04/29 20:57:28 |
| 2 |
|
| 3 |
Modified: ChangeLog multilib-build.eclass |
| 4 |
Log: |
| 5 |
Create ${CHOST}-prefixed tool symlinks for multilib portage, to gain better compatibility with plain multilib. |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.1230 eclass/ChangeLog |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1230&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1230&content-type=text/plain |
| 12 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1229&r2=1.1230 |
| 13 |
|
| 14 |
Index: ChangeLog |
| 15 |
=================================================================== |
| 16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v |
| 17 |
retrieving revision 1.1229 |
| 18 |
retrieving revision 1.1230 |
| 19 |
diff -u -r1.1229 -r1.1230 |
| 20 |
--- ChangeLog 29 Apr 2014 20:56:46 -0000 1.1229 |
| 21 |
+++ ChangeLog 29 Apr 2014 20:57:28 -0000 1.1230 |
| 22 |
@@ -1,6 +1,10 @@ |
| 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.1229 2014/04/29 20:56:46 mgorny Exp $ |
| 26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1230 2014/04/29 20:57:28 mgorny Exp $ |
| 27 |
+ |
| 28 |
+ 29 Apr 2014; Michał Górny <mgorny@g.o> multilib-build.eclass: |
| 29 |
+ Create ${CHOST}-prefixed tool symlinks for multilib portage, to gain better |
| 30 |
+ compatibility with plain multilib. |
| 31 |
|
| 32 |
29 Apr 2014; Michał Górny <mgorny@g.o> multilib-build.eclass: |
| 33 |
Disable wrappers for multilib portage only. Enable them in non-multilib |
| 34 |
|
| 35 |
|
| 36 |
|
| 37 |
1.43 eclass/multilib-build.eclass |
| 38 |
|
| 39 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?rev=1.43&view=markup |
| 40 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?rev=1.43&content-type=text/plain |
| 41 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?r1=1.42&r2=1.43 |
| 42 |
|
| 43 |
Index: multilib-build.eclass |
| 44 |
=================================================================== |
| 45 |
RCS file: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v |
| 46 |
retrieving revision 1.42 |
| 47 |
retrieving revision 1.43 |
| 48 |
diff -u -r1.42 -r1.43 |
| 49 |
--- multilib-build.eclass 29 Apr 2014 20:56:46 -0000 1.42 |
| 50 |
+++ multilib-build.eclass 29 Apr 2014 20:57:28 -0000 1.43 |
| 51 |
@@ -1,6 +1,6 @@ |
| 52 |
# Copyright 1999-2014 Gentoo Foundation |
| 53 |
# Distributed under the terms of the GNU General Public License v2 |
| 54 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v 1.42 2014/04/29 20:56:46 mgorny Exp $ |
| 55 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v 1.43 2014/04/29 20:57:28 mgorny Exp $ |
| 56 |
|
| 57 |
# @ECLASS: multilib-build.eclass |
| 58 |
# @MAINTAINER: |
| 59 |
@@ -295,11 +295,26 @@ |
| 60 |
|
| 61 |
[[ ${#} -le 1 ]] || die "${FUNCNAME}: too many arguments" |
| 62 |
|
| 63 |
- [[ ${COMPLETE_MULTILIB} == yes ]] && return |
| 64 |
- |
| 65 |
local root=${1:-${ED}} |
| 66 |
local f |
| 67 |
|
| 68 |
+ if [[ ${COMPLETE_MULTILIB} == yes ]]; then |
| 69 |
+ # symlink '${CHOST}-foo -> foo' to support abi-wrapper while |
| 70 |
+ # keeping ${CHOST}-foo calls correct. |
| 71 |
+ |
| 72 |
+ for f in "${MULTILIB_CHOST_TOOLS[@]}"; do |
| 73 |
+ # drop leading slash if it's there |
| 74 |
+ f=${f#/} |
| 75 |
+ |
| 76 |
+ local dir=${f%/*} |
| 77 |
+ local fn=${f##*/} |
| 78 |
+ |
| 79 |
+ ln -s "${fn}" "${root}/${dir}/${CHOST}-${fn}" || die |
| 80 |
+ done |
| 81 |
+ |
| 82 |
+ return |
| 83 |
+ fi |
| 84 |
+ |
| 85 |
for f in "${MULTILIB_WRAPPED_HEADERS[@]}"; do |
| 86 |
# drop leading slash if it's there |
| 87 |
f=${f#/} |
Archives