Permalink
Browse files

Fix mythwelcome in FE-only builds, add ccache for speedup.

A non-backend build was not building mythwelcome, so when this script
tried to package MythWelcome.app, it barfed. I usually --enable-backend,
so didn't notice the fault. This has been broken for ages.
A slightly different fix to Stuart's [e4c981f].
  • Loading branch information...
1 parent b38f237 commit 406b08c6ead1615401fa204a7b2eef3a4fe6a287 @NigelPearson NigelPearson committed Jan 24, 2011
Showing with 8 additions and 1 deletion.
  1. +8 −1 OSX/build/osx-packager.pl
@@ -61,6 +61,7 @@
our %depend_order = (
'mythtv'
=> [
+ 'ccache',
'dvdcss',
'freetype',
'lame',
@@ -265,6 +266,11 @@
'url' => 'http://www.tortall.net/projects/yasm/releases/yasm-1.1.0.tar.gz',
},
+ 'ccache' =>
+ {
+ 'url' => 'http://samba.org/ftp/ccache/ccache-3.1.4.tar.bz2',
+ },
+
);
@@ -1000,7 +1006,8 @@ END
if ( $comp eq 'mythtv' )
{
# Remove/add Nigel's frontend building speedup hack
- &DoSpeedupHacks('programs/programs.pro', 'mythfrontend mythavtest');
+ &DoSpeedupHacks('programs/programs.pro',
+ 'mythfrontend mythavtest mythwelcome');
}
&Verbose("Making $comp");

2 comments on commit 406b08c

Owner

stuarta commented on 406b08c Jan 24, 2011

This is going to make merging Using-Git branch fun!

Stuart

Member

NigelPearson replied Jan 24, 2011

Heh. Maybe.

I have tried to keep them in synch with cherry-pick. It should just be a matter of throwing away master, or moving it to an SVN-only repo.

Please sign in to comment.