diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2012-05-31 01:44:45 -0400 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2012-05-31 01:44:45 -0400 |
| commit | 4c4ebe8766f7e7f51538c8b7284acef9a007320b (patch) | |
| tree | 188a0eed7d57441c7c5102898b326abac7fd1324 | |
| parent | crossdev: split host and target ABIs (diff) | |
| download | crossdev-4c4ebe8766f7e7f51538c8b7284acef9a007320b.tar.gz crossdev-4c4ebe8766f7e7f51538c8b7284acef9a007320b.tar.bz2 crossdev-4c4ebe8766f7e7f51538c8b7284acef9a007320b.zip | |
crossdev: fix bad use flag settings with non-versioned packages
If the xVER variable isn't set, we only add 4 args to the array, and
the subsequent shift of 5 would fail. So we'd end up treating the
previous args as USE flags and add them to package.use. Make this
work as intended by quoting the VER variable.
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| -rw-r--r-- | TODO | 6 | ||||
| -rwxr-xr-x | crossdev | 4 |
2 files changed, 2 insertions, 8 deletions
@@ -1,8 +1,2 @@ - strip package.use.force (i.e. building x86_64 on x86_64 gets forced multilib) - filter /usr/CTARGET/ from revdep-rebuild #182601 - -- package.use not getting setup correctly: -# cat /etc/portage/package.use/cross-x86_64-cros-linux-gnu -cross-x86_64-cros-linux-gnu/gdb sys-devel gdb -cross-x86_64-cros-linux-gnu/insight dev-util insight -cross-x86_64-cros-linux-gnu/binutils -selinux multilib @@ -865,10 +865,10 @@ set_env() { } set_portage() { local l=$1 - eval set -- \${${l}CAT} \${${l}PKG} \${${l}VER} \"\${${l}ENV}\" \"\${${l}OVL}\" + eval set -- \${${l}CAT} \${${l}PKG} \"\${${l}VER}\" \"\${${l}ENV}\" \"\${${l}OVL}\" local cat=$1 pkg=$2 ver=$3 env=$4 ovl=$5 shift 5 - local use=$@ + local use=$* [[ ${pkg} == "[none]" ]] && return 0 |