Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Prevent rebase tool from duplicating the libraries that it rebases,

by getting it to process only the real libs, not symlinks to them.
Thanks to Craig Treleaven for discovering/troubleshooting. Closes #9291


git-svn-id: http://svn.mythtv.org/svn/trunk@27409 7dbf422c-18fa-0310-86e9-fd20926502f2
  • Loading branch information...
commit c5fa6385a56faa5a1124caec5f40a90b03bf5037 1 parent 3738bf7
@NigelPearson NigelPearson authored
Showing with 7 additions and 3 deletions.
  1. +7 −3 OSX/build/osx-packager.pl
View
10 OSX/build/osx-packager.pl
@@ -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
Please sign in to comment.
Something went wrong with that request. Please try again.