[Libreoffice-commits] .: solenv/bin

[Christian Lohmaier]

 solenv/bin/macosx-change-install-names.pl |    2 ++
 solenv/bin/macosx-dylib-link-list.pl      |    2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

New commits:
commit accb3a92574cb494053635ee64fad57dbfe65020
Author: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
Date:   Sat Jun 11 16:48:06 2011 +0200

    fix compilation with internal python on Mac

diff --git a/solenv/bin/macosx-change-install-names.pl b/solenv/bin/macosx-change-install-names.pl
index 7ac07d9..29bf64d 100644
--- a/solenv/bin/macosx-change-install-names.pl
+++ b/solenv/bin/macosx-change-install-names.pl
@@ -112,6 +112,8 @@ foreach $file (@ARGV)
     {
         $change .= " -change $1 " . action($type, $loc, $2) . "$3"
             if m'^\s*(@_{50}([^/]+)(/.+)) \(compatibility version \d+\.\d+\.\d+, current version \d+\.\d+\.\d+\)\n$';
+        $change .= ' -change '.$1.' @loader_path/'.$2
+            if m'^\s*(/python-inst/(OOoPython.framework/Versions/[^/]+/OOoPython))';
     }
     close(IN);
     if ($change ne "")
diff --git a/solenv/bin/macosx-dylib-link-list.pl b/solenv/bin/macosx-dylib-link-list.pl
index 700329c..bf1d4da 100644
--- a/solenv/bin/macosx-dylib-link-list.pl
+++ b/solenv/bin/macosx-dylib-link-list.pl
@@ -75,8 +75,8 @@ foreach $file (@todo)
         if (m'^\s*(@.+/([^/]+)) \(compatibility version \d+\.\d+\.\d+, current version \d+\.\d+\.\d+\)\n$')
         {
             my $full = $1;
-            next if ($full eq '@loader_path/OOoPython.framework/Versions/2.6/OOoPython');
             my $loc = locate($2);
+            $loc = locate($1) if $full =~ m'^\s*@loader_path/(OOoPython.framework/Versions/[^/]+/OOoPython)';
             if (defined $loc)
             {
                 handle($full, $loc) unless defined $done{$full};