strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

move UDP and fix linkoo to look for INPATH and UPD in config_host.mk

Browse source
This commit is contained in:
Norbert Thiebaud 2012-01-01 16:05:16 -06:00
parent 49319b288f
commit ea5d18a1c7
3 changed files with 3 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
config_host.mk.in
View file

@ -360,6 +360,7 @@ export SYSTEM_ZLIB="@SYSTEM_ZLIB@"
export THES_SYSTEM_DIR="@THES_SYSTEM_DIR@"
export TYPO_EXTENSION_PACK="@TYPO_EXTENSION_PACK@"
export UNIXWRAPPERNAME="@UNIXWRAPPERNAME@"
export UPD="@UPD@"
export USE_FT_EMBOLDEN="@USE_FT_EMBOLDEN@"
export USE_XINERAMA="@USE_XINERAMA@"
export VALGRIND_CFLAGS="@VALGRIND_CFLAGS@"

1
set_soenv.in
View file

@ -1327,7 +1327,6 @@ if ("@WITH_VC_REDIST@" eq "TRUE") {
ToFile( "WITH_VC_REDIST", "TRUE", "e" );
}
ToFile( "PERL", $PERL, "e" );
ToFile( "UPD", $UPD, "e" );
ToFile( "WORK_STAMP", $WORK_STAMP, "e" );
ToFile( "SOLARVER", $SOLARVER, "e" );
ToFile( "SOLARVERSION", $SOLARVERSION, "e" );

29
solenv/bin/linkoo
View file

@ -141,35 +141,10 @@ my @known_duplicates = ( 'db.jar', 'libi18n', 'libnssckbi', 'libnssdbm', 'libsql
sub sniff_target($)
{
my $build_dir = shift;
my ($dirhandle, $fname);
my ($target, $libver, $lang) = ( 'unxlngi6.pro', '680', 'en-US' ); # defaults
opendir ($dirhandle, $build_dir) || die "Can't open $build_dir";
while ($fname = readdir ($dirhandle)) {
if ($fname =~ /Host.sh$/) {
my $file;
open ($file, "$build_dir/$fname") || die "Can't open $build_dir/$fname";
while (<$file>) {
/\s*(\S+)\s*=\s*\"(\S+)\"/ || next;
if ($1 eq 'UPD') {
$libver = $2;
}
}
close ($file);
} elsif ($fname =~ /host.mk$/) {
my $file;
open ($file, "$build_dir/$fname") || die "Can't open $build_dir/$fname";
while (<$file>) {
/\s*export\s*(\S+)\s*=\s*\"(\S+)\"/ || next;
if ($1 eq 'INPATH') {
$target = $2;
}
}
close ($file);
}
}
closedir ($dirhandle);
chomp($target=`cat $build_dir/config_host.mk | grep INPATH= | sed -e 's/.*=//' | sed -e 's/"//g'`);
chomp($libver=`cat $build_dir/config_host.mk | grep UPD= | sed -e 's/.*=//' | sed -e 's/"//g'`);
print "Sniffed target: $target, $libver\n";