| 1 |
Author: grobian |
| 2 |
Date: 2008-05-04 09:14:18 +0000 (Sun, 04 May 2008) |
| 3 |
New Revision: 10173 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/branches/prefix/bin/misc-functions.sh |
| 7 |
Log: |
| 8 |
Also store the install_name, we need it to detect the group of files/symlinks that make up one library |
| 9 |
|
| 10 |
Modified: main/branches/prefix/bin/misc-functions.sh |
| 11 |
=================================================================== |
| 12 |
--- main/branches/prefix/bin/misc-functions.sh 2008-05-04 08:10:12 UTC (rev 10172) |
| 13 |
+++ main/branches/prefix/bin/misc-functions.sh 2008-05-04 09:14:18 UTC (rev 10173) |
| 14 |
@@ -375,11 +375,15 @@ |
| 15 |
rm -f "${T}"/.install_name_check_failed |
| 16 |
[[ ${CHOST} == *-darwin* ]] && find "${ED}" -type f | while IFS= read f ; do |
| 17 |
rm -f "${T}"/.NEEDED.tmp |
| 18 |
+ install_name=$(otool -DX "${f}") |
| 19 |
otool -LX "${f}" \ |
| 20 |
| grep -v "Archive : " \ |
| 21 |
| sed -e 's/^\t//' -e 's/ (compa.*$//' \ |
| 22 |
| while read r ; |
| 23 |
do |
| 24 |
+ # skip the self reference in libraries |
| 25 |
+ [[ -n ${install_name} && ${install_name} == ${r} ]] && continue |
| 26 |
+ |
| 27 |
if [[ ! -e ${r} && ! -e ${D}${r} && ${r} != *"@executable_path"* ]] ; then |
| 28 |
# try to "repair" this if possible, happens because of |
| 29 |
# gen_usr_ldscript tactics |
| 30 |
@@ -401,7 +405,7 @@ |
| 31 |
done |
| 32 |
if [[ -f "${T}"/.NEEDED.tmp ]] ; then |
| 33 |
needed=$(< "${T}"/.NEEDED.tmp) |
| 34 |
- echo "/${f#${D}};${needed#,}" >> "${PORTAGE_BUILDDIR}"/build-info/NEEDED.MACHO.2 |
| 35 |
+ echo "/${f#${D}};${install_name};${needed#,}" >> "${PORTAGE_BUILDDIR}"/build-info/NEEDED.MACHO.2 |
| 36 |
fi |
| 37 |
done |
| 38 |
if [[ -f ${T}/.install_name_check_failed ]] ; then |
| 39 |
|
| 40 |
-- |
| 41 |
gentoo-commits@l.g.o mailing list |
Archives