Skip to content

Commit d7758d6

Browse files
committed
Update tools dir
1 parent 4857793 commit d7758d6

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

external/buildscripts/build.pl

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -351,17 +351,17 @@
351351
my $texinfoVersion = "4.8";
352352
my $automakeVersion = "1.15";
353353
my $libtoolVersion = "2.4.6";
354-
my $autoconfDir = "$externalBuildDeps/autoconf-$autoconfVersion";
355-
my $texinfoDir = "$externalBuildDeps/texinfo-$texinfoVersion";
356-
my $automakeDir = "$externalBuildDeps/automake-$automakeVersion";
357-
my $libtoolDir = "$externalBuildDeps/libtool-$libtoolVersion";
354+
my $autoconfDir = "$externalBuildDeps/autoconf-2-69/autoconf-$autoconfVersion";
355+
my $texinfoDir = "$externalBuildDeps/texinfo-4-8/texinfo-$texinfoVersion";
356+
my $automakeDir = "$externalBuildDeps/automake-1-15/automake-$automakeVersion";
357+
my $libtoolDir = "$externalBuildDeps/libtool-2-4-6/libtool-$libtoolVersion";
358358
my $builtToolsDir = "$externalBuildDeps/built-tools";
359359

360360
$ENV{PATH} = "$builtToolsDir/bin:$ENV{PATH}";
361361

362362
if (!(-d "$autoconfDir"))
363363
{
364-
chdir("$externalBuildDeps") eq 1 or die ("failed to chdir to external directory\n");
364+
chdir("$externalBuildDeps/autoconf-2-69") eq 1 or die ("failed to chdir to external directory\n");
365365
system("tar xzf autoconf-$autoconfVersion.tar.gz") eq 0 or die ("failed to extract autoconf\n");
366366

367367
chdir("$autoconfDir") eq 1 or die ("failed to chdir to autoconf directory\n");
@@ -374,7 +374,7 @@
374374

375375
if (!(-d "$texinfoDir") and $windowsSubsystemForLinux)
376376
{
377-
chdir("$externalBuildDeps") eq 1 or die ("failed to chdir to external directory\n");
377+
chdir("$externalBuildDeps/texinfo-4-8") eq 1 or die ("failed to chdir to external directory\n");
378378
system("tar xzf texinfo-$texinfoVersion.tar.gz") eq 0 or die ("failed to extract texinfo\n");
379379

380380
chdir($texinfoDir) eq 1 or die ("failed to chdir to texinfo directory\n");
@@ -388,7 +388,7 @@
388388
if (!(-d "$automakeDir"))
389389
{
390390
my $automakeMakeFlags = "";
391-
chdir("$externalBuildDeps") eq 1 or die ("failed to chdir to external directory\n");
391+
chdir("$externalBuildDeps/automake-1-15") eq 1 or die ("failed to chdir to external directory\n");
392392
system("tar xzf automake-$automakeVersion.tar.gz") eq 0 or die ("failed to extract automake\n");
393393

394394
chdir("$automakeDir") eq 1 or die ("failed to chdir to automake directory\n");
@@ -406,7 +406,7 @@
406406

407407
if (!(-d "$libtoolDir"))
408408
{
409-
chdir("$externalBuildDeps") eq 1 or die ("failed to chdir to external directory\n");
409+
chdir("$externalBuildDeps/libtool-2-4-6") eq 1 or die ("failed to chdir to external directory\n");
410410
system("tar xzf libtool-$libtoolVersion.tar.gz") eq 0 or die ("failed to extract libtool\n");
411411

412412
chdir("$libtoolDir") eq 1 or die ("failed to chdir to libtool directory\n");
@@ -1096,8 +1096,8 @@
10961096
print(">>> Linux SDK Version = $sdkVersion\n");
10971097

10981098
my $sdkName = "linux-sdk-$sdkVersion.tar.bz2";
1099-
my $depsSdkArchive = "$externalBuildDeps/$sdkName";
1100-
my $depsSdkFinal = "$externalBuildDeps/linux-sdk-$sdkVersion";
1099+
my $depsSdkArchive = "$externalBuildDeps/linux-sdk-$sdkVersion/$sdkName";
1100+
my $depsSdkFinal = "$externalBuildDeps/linux-sdk-$sdkVersion/linux-sdk-$sdkVersion";
11011101

11021102
print(">>> Linux SDK Archive = $depsSdkArchive\n");
11031103
print(">>> Linux SDK Extraction Destination = $depsSdkFinal\n");

0 commit comments

Comments
 (0)