1 |
Directory prefixify part 4. |
2 |
|
3 |
LIBPATH, etc. now have EPREFIX prepended. The latter need to be |
4 |
quoted. |
5 |
--- |
6 |
eclass/toolchain.eclass | 22 +++++++++++----------- |
7 |
1 file changed, 11 insertions(+), 11 deletions(-) |
8 |
|
9 |
diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass |
10 |
index f54316c..941e37b 100644 |
11 |
--- a/eclass/toolchain.eclass |
12 |
+++ b/eclass/toolchain.eclass |
13 |
@@ -983,10 +983,10 @@ toolchain_src_configure() { |
14 |
elif built_with_use --hidden --missing false ${CATEGORY}/${needed_libc} crosscompile_opts_headers-only ; then |
15 |
confgcc+=( |
16 |
"${confgcc_no_libc[@]}" |
17 |
- --with-sysroot=${PREFIX}/${CTARGET} |
18 |
+ --with-sysroot="${PREFIX}"/${CTARGET} |
19 |
) |
20 |
else |
21 |
- confgcc+=( --with-sysroot=${PREFIX}/${CTARGET} ) |
22 |
+ confgcc+=( --with-sysroot="${PREFIX}"/${CTARGET} ) |
23 |
fi |
24 |
fi |
25 |
|
26 |
@@ -1812,11 +1812,11 @@ toolchain_src_install() { |
27 |
# Use gid of 0 because some stupid ports don't have |
28 |
# the group 'root' set to gid 0. Send to /dev/null |
29 |
# for people who are testing as non-root. |
30 |
- chown -R root:0 "${D}"${LIBPATH} 2>/dev/null |
31 |
+ chown -R root:0 "${D}${LIBPATH}" 2>/dev/null |
32 |
|
33 |
# Move pretty-printers to gdb datadir to shut ldconfig up |
34 |
local py gdbdir=/usr/share/gdb/auto-load${LIBPATH/\/lib\//\/$(get_libdir)\/} |
35 |
- pushd "${D}"${LIBPATH} >/dev/null |
36 |
+ pushd "${D}${LIBPATH}" >/dev/null |
37 |
for py in $(find . -name '*-gdb.py') ; do |
38 |
local multidir=${py%/*} |
39 |
insinto "${gdbdir}/${multidir}" |
40 |
@@ -1862,16 +1862,16 @@ gcc_movelibs() { |
41 |
|
42 |
local OS_MULTIDIR=$($(XGCC) ${multiarg} --print-multi-os-directory) |
43 |
local MULTIDIR=$($(XGCC) ${multiarg} --print-multi-directory) |
44 |
- local TODIR=${D}${LIBPATH}/${MULTIDIR} |
45 |
+ local TODIR="${D}${LIBPATH}"/${MULTIDIR} |
46 |
local FROMDIR= |
47 |
|
48 |
[[ -d ${TODIR} ]] || mkdir -p ${TODIR} |
49 |
|
50 |
for FROMDIR in \ |
51 |
- ${LIBPATH}/${OS_MULTIDIR} \ |
52 |
- ${LIBPATH}/../${MULTIDIR} \ |
53 |
- ${PREFIX}/lib/${OS_MULTIDIR} \ |
54 |
- ${PREFIX}/${CTARGET}/lib/${OS_MULTIDIR} |
55 |
+ "${LIBPATH}"/${OS_MULTIDIR} \ |
56 |
+ "${LIBPATH}"/../${MULTIDIR} \ |
57 |
+ "${PREFIX}"/lib/${OS_MULTIDIR} \ |
58 |
+ "${PREFIX}"/${CTARGET}/lib/${OS_MULTIDIR} |
59 |
do |
60 |
removedirs="${removedirs} ${FROMDIR}" |
61 |
FROMDIR=${D}${FROMDIR} |
62 |
@@ -2034,12 +2034,12 @@ gcc_slot_java() { |
63 |
# Move random gcj files to compiler-specific directories |
64 |
for x in libgcj.spec logging.properties ; do |
65 |
x="${D}${PREFIX}/lib/${x}" |
66 |
- [[ -f ${x} ]] && mv -f "${x}" "${D}"${LIBPATH}/ |
67 |
+ [[ -f ${x} ]] && mv -f "${x}" "${D}${LIBPATH}"/ |
68 |
done |
69 |
|
70 |
# Rename jar because it could clash with Kaffe's jar if this gcc is |
71 |
# primary compiler (aka don't have the -<version> extension) |
72 |
- cd "${D}"${BINPATH} |
73 |
+ cd "${D}${BINPATH}" |
74 |
[[ -f jar ]] && mv -f jar gcj-jar |
75 |
} |
76 |
|
77 |
-- |
78 |
2.8.3 |