Permalink
Browse files

Merge 27409 from trunk

git-svn-id: http://svn.mythtv.org/svn/branches/release-0-24-fixes@27410 7dbf422c-18fa-0310-86e9-fd20926502f2
  • Loading branch information...
NigelPearson committed Dec 2, 2010
1 parent cdda8c0 commit 7354fd2a844c6fae5ef806908a7148c961ac8093
Showing with 7 additions and 3 deletions.
  1. +7 −3 OSX/build/osx-packager.pl
View
@@ -1166,11 +1166,15 @@ END
"$finalTarget/Contents/MacOS" ]) or die;
}
- # Run 'rebase' on all the frameworks:
+ # Run 'rebase' on all the frameworks, for slightly faster loading.
+ # Note that we process the real library, not symlinks to it,
+ # to prevent rebase erroneously creating copies:
my @libs = glob "$finalTarget/Contents/Frameworks/*";
- @libs = grep(s,(.*/)(\w+).framework$,$1$2.framework/$2, , @libs);
- # and all the filters/plugins:
+ @libs = grep(s,(.*/)(\w+).framework$,$1$2.framework/Versions/A/$2, , @libs);
+
+ # Also process all the filters/plugins:
push(@libs, glob "$finalTarget/Contents/Resources/lib/mythtv/*/*");
+
if ( $OPT{'verbose'} )
{ &Syscall([ 'rebase', '-v', @libs ]) or die }
else

0 comments on commit 7354fd2

Please sign in to comment.