|
Lines 93-109
Link Here
|
| 93 |
# "lib" is a symlink, so need to convert to a dir |
93 |
# "lib" is a symlink, so need to convert to a dir |
| 94 |
ewarn "Converting ${prefix}lib from a symlink to a dir" |
94 |
ewarn "Converting ${prefix}lib from a symlink to a dir" |
| 95 |
rm -f "${prefix}lib" || die |
95 |
rm -f "${prefix}lib" || die |
| 96 |
if [ -d "${prefix}lib32" ] ; then |
96 |
if use amd64-fbsd ; then |
| 97 |
ewarn "Migrating ${prefix}lib32 to ${prefix}lib" |
97 |
if [ -d "${prefix}lib64" ] && [ ! -L "${prefix}lib64" ] ; then |
| 98 |
mv "${prefix}lib32" "${prefix}lib" || die |
98 |
ewarn "Migrating ${prefix}lib64 to ${prefix}lib" |
|
|
99 |
LD_LIBRARY_PATH="${prefix}lib64" mv "${prefix}lib64" "${prefix}lib" || die |
| 100 |
ln -s lib ${prefix}lib64 |
| 101 |
fi |
| 99 |
else |
102 |
else |
| 100 |
mkdir -p "${prefix}lib" || die |
103 |
if [ -d "${prefix}lib32" ] ; then |
|
|
104 |
ewarn "Migrating ${prefix}lib32 to ${prefix}lib" |
| 105 |
mv "${prefix}lib32" "${prefix}lib" || die |
| 106 |
else |
| 107 |
mkdir -p "${prefix}lib" || die |
| 108 |
fi |
| 101 |
fi |
109 |
fi |
| 102 |
elif [ -d "${prefix}lib" ] ; then |
110 |
elif [ -d "${prefix}lib" ] ; then |
| 103 |
# make sure the old "lib" ABI location does not exist; we |
111 |
# make sure the old "lib" ABI location does not exist; we |
| 104 |
# only symlinked the lib dir on systems where we moved it |
112 |
# only symlinked the lib dir on systems where we moved it |
| 105 |
# to "lib32" ... |
113 |
# to "lib32" ... |
| 106 |
case ${CHOST} in |
114 |
case ${CHOST} in |
|
|
115 |
x86_64*-freebsd*) |
| 116 |
if [ -d "${prefix}lib64" ] && [ ! -L "${prefix}lib64" ] ; then |
| 117 |
rm -f "${prefix}lib64"/.keep |
| 118 |
if ! rmdir "${prefix}lib64" 2>/dev/null ; then |
| 119 |
ewarn "You need to merge ${prefix}lib64 into ${prefix}lib" |
| 120 |
die "non-empty dir found where there should be none: ${prefix}lib64" |
| 121 |
fi |
| 122 |
fi |
| 123 |
if [ -L "${prefix}lib64" ] ; then |
| 124 |
ewarn "Gentoo/FreeBSD AMD64 has been changed to use lib/lib32 dir." |
| 125 |
ewarn "Your environment has been migrated to use lib/lib32 dir from lib64/lib32" |
| 126 |
ewarn "Symbolic links ${prefix}lib64 exist in your environment for upgrade safety." |
| 127 |
ewarn |
| 128 |
ewarn "Please run 'emerge -e world' and remove symlink ${prefix}lib64" |
| 129 |
fi |
| 130 |
;; |
| 107 |
i?86*|x86_64*|powerpc*|sparc*|s390*) |
131 |
i?86*|x86_64*|powerpc*|sparc*|s390*) |
| 108 |
if [ -d "${prefix}lib32" ] ; then |
132 |
if [ -d "${prefix}lib32" ] ; then |
| 109 |
rm -f "${prefix}lib32"/.keep |
133 |
rm -f "${prefix}lib32"/.keep |
