diff options
author | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2011-06-11 16:48:06 +0200 |
---|---|---|
committer | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2011-06-11 16:48:06 +0200 |
commit | 1251f860a0ef06ac6cc32b9d1e0309a48ebefc00 (patch) | |
tree | aa3999e4cce15f11f0dd80410c6fbf301d59e7f1 | |
parent | f0ae283cf05ca55751e9c2f04e98ef8031edaad1 (diff) |
fix compilation with internal python on Mac
-rw-r--r-- | solenv/bin/macosx-change-install-names.pl | 2 | ||||
-rw-r--r-- | solenv/bin/macosx-dylib-link-list.pl | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/solenv/bin/macosx-change-install-names.pl b/solenv/bin/macosx-change-install-names.pl index 7ac07d9f88b0..29bf64de2b6b 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 71a2f6737552..ab2279f62cd8 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}; |