commit 0822effa54d55d9df80f7ca032f079c40b46d0ef Author: Robert Ransom rransom.8774@gmail.com Date: Fri Sep 2 01:52:16 2011 -0400
[2312 Linux] Allow libevent.so to point to libevent-2.0.so.5.1.2 --- build-scripts/remove-shared-lib-symlinks | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/build-scripts/remove-shared-lib-symlinks b/build-scripts/remove-shared-lib-symlinks index 39d5060..779b707 100755 --- a/build-scripts/remove-shared-lib-symlinks +++ b/build-scripts/remove-shared-lib-symlinks @@ -69,9 +69,9 @@ foreach {x} $shared_lib_filenames { } }
-# Check that every shared library symlink points to a file or symlink -# whose name starts with the symlink's name followed by a ".", and is -# longer. +# Check that every shared library symlink not of the form lib*.so +# points to a file or symlink whose name starts with the symlink's +# name followed by a ".", and is longer. # # FIXME This currently allows 'libfoozer.so.3' to point to # 'libfoozer.so.3.17.so.so.so.42.7'. That should be fixed, as a @@ -79,6 +79,13 @@ foreach {x} $shared_lib_filenames { foreach {x} $shared_lib_filenames { if {[file type $x] eq "file"} {continue}
+ if {[string match lib*.so $x]} { + # This is a shared library symlink of the form lib*.so ; it is + # only used at build time, and it may point to a shared + # library with a different name. + continue + } + set link_target [file readlink $x] if {![file exists $link_target]} { set link_target_type {}
tor-commits@lists.torproject.org