1 |
commit: 4c4ebe8766f7e7f51538c8b7284acef9a007320b |
2 |
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu May 31 05:44:45 2012 +0000 |
4 |
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu May 31 05:44:45 2012 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/crossdev.git;a=commit;h=4c4ebe87 |
7 |
|
8 |
crossdev: fix bad use flag settings with non-versioned packages |
9 |
|
10 |
If the xVER variable isn't set, we only add 4 args to the array, and |
11 |
the subsequent shift of 5 would fail. So we'd end up treating the |
12 |
previous args as USE flags and add them to package.use. Make this |
13 |
work as intended by quoting the VER variable. |
14 |
|
15 |
Signed-off-by: Mike Frysinger <vapier <AT> gentoo.org> |
16 |
|
17 |
--- |
18 |
TODO | 6 ------ |
19 |
crossdev | 4 ++-- |
20 |
2 files changed, 2 insertions(+), 8 deletions(-) |
21 |
|
22 |
diff --git a/TODO b/TODO |
23 |
index f5e089b..5cfdc52 100644 |
24 |
--- a/TODO |
25 |
+++ b/TODO |
26 |
@@ -1,8 +1,2 @@ |
27 |
- strip package.use.force (i.e. building x86_64 on x86_64 gets forced multilib) |
28 |
- filter /usr/CTARGET/ from revdep-rebuild #182601 |
29 |
- |
30 |
-- package.use not getting setup correctly: |
31 |
-# cat /etc/portage/package.use/cross-x86_64-cros-linux-gnu |
32 |
-cross-x86_64-cros-linux-gnu/gdb sys-devel gdb |
33 |
-cross-x86_64-cros-linux-gnu/insight dev-util insight |
34 |
-cross-x86_64-cros-linux-gnu/binutils -selinux multilib |
35 |
|
36 |
diff --git a/crossdev b/crossdev |
37 |
index 9a294fe..454318c 100755 |
38 |
--- a/crossdev |
39 |
+++ b/crossdev |
40 |
@@ -865,10 +865,10 @@ set_env() { |
41 |
} |
42 |
set_portage() { |
43 |
local l=$1 |
44 |
- eval set -- \${${l}CAT} \${${l}PKG} \${${l}VER} \"\${${l}ENV}\" \"\${${l}OVL}\" |
45 |
+ eval set -- \${${l}CAT} \${${l}PKG} \"\${${l}VER}\" \"\${${l}ENV}\" \"\${${l}OVL}\" |
46 |
local cat=$1 pkg=$2 ver=$3 env=$4 ovl=$5 |
47 |
shift 5 |
48 |
- local use=$@ |
49 |
+ local use=$* |
50 |
|
51 |
[[ ${pkg} == "[none]" ]] && return 0 |