|
Lines 274-280
Link Here
|
| 274 |
# 2005.0 is setup properly, and this is executed as part of the |
274 |
# 2005.0 is setup properly, and this is executed as part of the |
| 275 |
# 2004.3 -> 2005.0 upgrade script. |
275 |
# 2004.3 -> 2005.0 upgrade script. |
| 276 |
# It can be removed after 2004.3 has been purged from portage. |
276 |
# It can be removed after 2004.3 has been purged from portage. |
| 277 |
use amd64 && [ "$(get_libdir)" == "lib64" ] && ! has_multilib_profile && fix_lib64_symlinks |
277 |
( use amd64 || use ppc64 ) && [ "$(get_libdir)" == "lib64" ] && ! has_multilib_profile && fix_lib64_symlinks |
| 278 |
|
278 |
|
| 279 |
# it appears that /lib/tls is sometimes not removed. See bug |
279 |
# it appears that /lib/tls is sometimes not removed. See bug |
| 280 |
# 69258 for more info. |
280 |
# 69258 for more info. |
|
Lines 942-948
Link Here
|
| 942 |
rm ${ROOT}/lib64 |
942 |
rm ${ROOT}/lib64 |
| 943 |
# now that lib64 is gone, nothing will run without calling ld.so |
943 |
# now that lib64 is gone, nothing will run without calling ld.so |
| 944 |
# directly. luckily the window of brokenness is almost non-existant |
944 |
# directly. luckily the window of brokenness is almost non-existant |
| 945 |
/lib/ld-linux-x86-64.so.2 /bin/mv ${ROOT}/lib ${ROOT}/lib64 |
945 |
use amd64 && /lib/ld-linux-x86-64.so.2 /bin/mv ${ROOT}/lib ${ROOT}/lib64 |
|
|
946 |
use ppc64 && /lib/ld64.so.1 /bin/mv ${ROOT}/lib ${ROOT}/lib64 |
| 946 |
# all better :) |
947 |
# all better :) |
| 947 |
ldconfig |
948 |
ldconfig |
| 948 |
ln -s lib64 ${ROOT}/lib |
949 |
ln -s lib64 ${ROOT}/lib |
|
Lines 1040-1046
Link Here
|
| 1040 |
powerpc64*) |
1041 |
powerpc64*) |
| 1041 |
export CFLAGS_ppc="${CFLAGS_ppc--m32}" |
1042 |
export CFLAGS_ppc="${CFLAGS_ppc--m32}" |
| 1042 |
export CHOST_ppc="powerpc-unknown-linux-gnu" |
1043 |
export CHOST_ppc="powerpc-unknown-linux-gnu" |
| 1043 |
export CDEFINE_ppc="__powerpc__" |
1044 |
export CDEFINE_ppc="!__powerpc64__" |
| 1044 |
export LIBDIR_ppc="lib" |
1045 |
export LIBDIR_ppc="lib" |
| 1045 |
|
1046 |
|
| 1046 |
export CFLAGS_ppc64="${CFLAGS_ppc64--m64}" |
1047 |
export CFLAGS_ppc64="${CFLAGS_ppc64--m64}" |
|
Lines 1295-1306
Link Here
|
| 1295 |
LIBDIR_x86="lib" |
1296 |
LIBDIR_x86="lib" |
| 1296 |
fi |
1297 |
fi |
| 1297 |
|
1298 |
|
|
|
1299 |
if [[ $(tc-arch) == "ppc64" && ${ABI} == "ppc" && $(get_libdir) != "lib" ]] && ! is_crosscompile; then |
| 1300 |
OLD_LIBDIR="$(get_libdir)" |
| 1301 |
LIBDIR_ppc="lib" |
| 1302 |
fi |
| 1303 |
|
| 1298 |
toolchain-glibc_src_install |
1304 |
toolchain-glibc_src_install |
| 1299 |
|
1305 |
|
| 1300 |
# Handle stupid lib32 BS on amd64 |
1306 |
# Handle stupid lib32 BS on amd64 and ppc64 |
| 1301 |
if [[ -n ${OLD_LIBDIR} ]] ; then |
1307 |
if [[ -n ${OLD_LIBDIR} ]] ; then |
| 1302 |
cd ${S} |
1308 |
cd ${S} |
| 1303 |
LIBDIR_x86="${OLD_LIBDIR}" |
1309 |
[[ $(tc-arch) == "amd64" ]] && LIBDIR_x86="${OLD_LIBDIR}" |
|
|
1310 |
[[ $(tc-arch) == "ppc64" ]] && LIBDIR_ppc="${OLD_LIBDIR}" |
| 1304 |
unset OLD_LIBDIR |
1311 |
unset OLD_LIBDIR |
| 1305 |
|
1312 |
|
| 1306 |
mv ${D}/lib ${D}/$(get_libdir) |
1313 |
mv ${D}/lib ${D}/$(get_libdir) |
|
Lines 1308-1314
Link Here
|
| 1308 |
dodir /lib |
1315 |
dodir /lib |
| 1309 |
dodir /usr/lib |
1316 |
dodir /usr/lib |
| 1310 |
mv ${D}/usr/$(get_libdir)/locale ${D}/usr/lib |
1317 |
mv ${D}/usr/$(get_libdir)/locale ${D}/usr/lib |
| 1311 |
dosym ../$(get_libdir)/ld-linux.so.2 /lib/ld-linux.so.2 |
1318 |
[[ $(tc-arch) == "amd64" ]] && dosym ../$(get_libdir)/ld-linux.so.2 /lib/ld-linux.so.2 |
|
|
1319 |
[[ $(tc-arch) == "ppc64" ]] && dosym ../$(get_libdir)/ld.so.1 /lib/ld.so.1 |
| 1312 |
|
1320 |
|
| 1313 |
for f in ${D}/usr/$(get_libdir)/*.so; do |
1321 |
for f in ${D}/usr/$(get_libdir)/*.so; do |
| 1314 |
local basef=$(basename ${f}) |
1322 |
local basef=$(basename ${f}) |
