|
Lines 1964-1985
Link Here
|
| 1964 |
if [[ -n ${files} ]] ; then |
1964 |
if [[ -n ${files} ]] ; then |
| 1965 |
mv ${files} "${TODIR}" |
1965 |
mv ${files} "${TODIR}" |
| 1966 |
fi |
1966 |
fi |
| 1967 |
fi |
1967 |
fi |
| 1968 |
done |
1968 |
done |
|
|
1969 |
fix_libtool_libdir_paths "${LIBPATH}/${MULTIDIR}" |
| 1969 |
done |
1970 |
done |
| 1970 |
|
1971 |
|
| 1971 |
# We remove directories separately to avoid this case: |
1972 |
# We remove directories separately to avoid this case: |
| 1972 |
# mv SRC/lib/../lib/*.o DEST |
1973 |
# mv SRC/lib/../lib/*.o DEST |
| 1973 |
# rmdir SRC/lib/../lib/ |
1974 |
# rmdir SRC/lib/../lib/ |
| 1974 |
# mv SRC/lib/../lib32/*.o DEST # Bork |
1975 |
# mv SRC/lib/../lib32/*.o DEST # Bork |
| 1975 |
for FROMDIR in ${removedirs} ; do |
1976 |
for FROMDIR in ${removedirs} ; do |
| 1976 |
rmdir "${D}"${FROMDIR} >& /dev/null |
1977 |
rmdir "${D}"${FROMDIR} >& /dev/null |
| 1977 |
done |
1978 |
done |
| 1978 |
find "${D}" -type d | xargs rmdir >& /dev/null |
1979 |
find "${D}" -type d | xargs rmdir >& /dev/null |
| 1979 |
|
|
|
| 1980 |
fix_libtool_libdir_paths |
| 1981 |
} |
1980 |
} |
| 1982 |
|
1981 |
|
| 1983 |
#----<< src_* >>---- |
1982 |
#----<< src_* >>---- |
| 1984 |
|
1983 |
|
| 1985 |
#---->> unorganized crap in need of refactoring follows |
1984 |
#---->> unorganized crap in need of refactoring follows |
|
Lines 2481-2493
Link Here
|
| 2481 |
# -are-, and not where they -used- to be. also, any dependencies we have |
2480 |
# -are-, and not where they -used- to be. also, any dependencies we have |
| 2482 |
# on our own .la files need to be updated. |
2481 |
# on our own .la files need to be updated. |
| 2483 |
fix_libtool_libdir_paths() { |
2482 |
fix_libtool_libdir_paths() { |
| 2484 |
pushd "${D}" >/dev/null |
2483 |
pushd "${D}" >/dev/null |
| 2485 |
|
2484 |
|
| 2486 |
local dir=${LIBPATH} |
2485 |
pushd "${1}" >/dev/null |
| 2487 |
local allarchives=$(cd ./${dir}; echo *.la) |
2486 |
local dir="${PWD#${D}}" |
|
|
2487 |
local allarchives=$(echo *.la) |
| 2488 |
allarchives="\(${allarchives// /\\|}\)" |
2488 |
allarchives="\(${allarchives// /\\|}\)" |
|
|
2489 |
popd >/dev/null |
| 2489 |
|
2490 |
|
| 2490 |
sed -i \ |
2491 |
sed -i \ |
| 2491 |
-e "/^libdir=/s:=.*:='${dir}':" \ |
2492 |
-e "/^libdir=/s:=.*:='${dir}':" \ |
| 2492 |
./${dir}/*.la |
2493 |
./${dir}/*.la |
| 2493 |
sed -i \ |
2494 |
sed -i \ |
