diff --git a/external/buildscripts/build_classlibs_osx.pl b/external/buildscripts/build_classlibs_osx.pl index 59be0b70cf82f40074184613a8713345ac699191..e447cc39749f9e7486425210e8451aa44aa837b8 100644 --- a/external/buildscripts/build_classlibs_osx.pl +++ b/external/buildscripts/build_classlibs_osx.pl @@ -96,16 +96,16 @@ if (not $skipbuild) my $autoconfVersion = "2.69"; my $automakeVersion = "1.15"; my $libtoolVersion = "2.4.6"; - my $autoconfDir = "$externalBuildDeps/autoconf-$autoconfVersion"; - my $automakeDir = "$externalBuildDeps/automake-$automakeVersion"; - my $libtoolDir = "$externalBuildDeps/libtool-$libtoolVersion"; + my $autoconfDir = "$externalBuildDeps/autoconf-2-69/autoconf-$autoconfVersion"; + my $automakeDir = "$externalBuildDeps/automake-1-15/automake-$automakeVersion"; + my $libtoolDir = "$externalBuildDeps/libtool-2-4-6/libtool-$libtoolVersion"; my $builtToolsDir = "$externalBuildDeps/built-tools"; $ENV{PATH} = "$builtToolsDir/bin:$ENV{PATH}"; if (!(-d "$autoconfDir")) { - chdir("$externalBuildDeps") eq 1 or die ("failed to chdir to external directory\n"); + chdir("$externalBuildDeps/autoconf-2-69") eq 1 or die ("failed to chdir to external directory\n"); system("tar xzf autoconf-$autoconfVersion.tar.gz") eq 0 or die ("failed to extract autoconf\n"); chdir("$autoconfDir") eq 1 or die ("failed to chdir to autoconf directory\n"); @@ -120,7 +120,7 @@ if (not $skipbuild) if (!(-d "$automakeDir")) { - chdir("$externalBuildDeps") eq 1 or die ("failed to chdir to external directory\n"); + chdir("$externalBuildDeps/automake-1-15") eq 1 or die ("failed to chdir to external directory\n"); system("tar xzf automake-$automakeVersion.tar.gz") eq 0 or die ("failed to extract automake\n"); chdir("$automakeDir") eq 1 or die ("failed to chdir to automake directory\n"); @@ -136,7 +136,7 @@ if (not $skipbuild) if (!(-d "$libtoolDir")) { - chdir("$externalBuildDeps") eq 1 or die ("failed to chdir to external directory\n"); + chdir("$externalBuildDeps/libtool-2-4-6") eq 1 or die ("failed to chdir to external directory\n"); system("tar xzf libtool-$libtoolVersion.tar.gz") eq 0 or die ("failed to extract libtool\n"); chdir("$libtoolDir") eq 1 or die ("failed to chdir to libtool directory\n"); diff --git a/external/buildscripts/build_runtime_osx.pl b/external/buildscripts/build_runtime_osx.pl index e4a22b31a5d4ae6df11ba1bd91dd759dc5dc1e17..e4f6bfeada842293086203261c2c69641d5a936a 100644 --- a/external/buildscripts/build_runtime_osx.pl +++ b/external/buildscripts/build_runtime_osx.pl @@ -64,9 +64,9 @@ if ($externalBuildDeps ne "") my $autoconfVersion = "2.69"; my $automakeVersion = "1.15"; my $libtoolVersion = "2.4.6"; - my $autoconfDir = "$externalBuildDeps/autoconf-$autoconfVersion"; - my $automakeDir = "$externalBuildDeps/automake-$automakeVersion"; - my $libtoolDir = "$externalBuildDeps/libtool-$libtoolVersion"; + my $autoconfDir = "$externalBuildDeps/autoconf-2-69/autoconf-$autoconfVersion"; + my $automakeDir = "$externalBuildDeps/automake-1-15/automake-$automakeVersion"; + my $libtoolDir = "$externalBuildDeps/libtool-2-4-6/libtool-$libtoolVersion"; my $builtToolsDir = "$externalBuildDeps/built-tools"; @@ -74,7 +74,7 @@ if ($externalBuildDeps ne "") if (!(-d "$autoconfDir")) { - chdir("$externalBuildDeps") eq 1 or die ("failed to chdir to external directory\n"); + chdir("$externalBuildDeps/autoconf-2-69") eq 1 or die ("failed to chdir to external directory\n"); system("tar xzf autoconf-$autoconfVersion.tar.gz") eq 0 or die ("failed to extract autoconf\n"); chdir("$autoconfDir") eq 1 or die ("failed to chdir to autoconf directory\n"); @@ -89,7 +89,7 @@ if ($externalBuildDeps ne "") if (!(-d "$automakeDir")) { - chdir("$externalBuildDeps") eq 1 or die ("failed to chdir to external directory\n"); + chdir("$externalBuildDeps/automake-1-15") eq 1 or die ("failed to chdir to external directory\n"); system("tar xzf automake-$automakeVersion.tar.gz") eq 0 or die ("failed to extract automake\n"); chdir("$automakeDir") eq 1 or die ("failed to chdir to automake directory\n"); @@ -104,7 +104,7 @@ if ($externalBuildDeps ne "") if (!(-d "$libtoolDir")) { - chdir("$externalBuildDeps") eq 1 or die ("failed to chdir to external directory\n"); + chdir("$externalBuildDeps/libtool-2-4-6") eq 1 or die ("failed to chdir to external directory\n"); system("tar xzf libtool-$libtoolVersion.tar.gz") eq 0 or die ("failed to extract libtool\n"); chdir("$libtoolDir") eq 1 or die ("failed to chdir to libtool directory\n"); diff --git a/external/buildscripts/prepare_osx_build.pl b/external/buildscripts/prepare_osx_build.pl index 7fdbd660ac0f0a35244ff99efb3f1ea83a84d699..668137008bc58639c97ae487cdc9a1da62cd141e 100644 --- a/external/buildscripts/prepare_osx_build.pl +++ b/external/buildscripts/prepare_osx_build.pl @@ -10,9 +10,9 @@ if ($externalBuildDeps ne "") my $autoconfVersion = "2.69"; my $automakeVersion = "1.15"; my $libtoolVersion = "2.4.6"; - my $autoconfDir = "$externalBuildDeps/autoconf-$autoconfVersion"; - my $automakeDir = "$externalBuildDeps/automake-$automakeVersion"; - my $libtoolDir = "$externalBuildDeps/libtool-$libtoolVersion"; + my $autoconfDir = "$externalBuildDeps/autoconf-2-69/autoconf-$autoconfVersion"; + my $automakeDir = "$externalBuildDeps/automake-1-15/automake-$automakeVersion"; + my $libtoolDir = "$externalBuildDeps/libtool-2-4-6/libtool-$libtoolVersion"; my $builtToolsDir = "$externalBuildDeps/built-tools"; @@ -20,7 +20,7 @@ if ($externalBuildDeps ne "") if (!(-d "$autoconfDir")) { - chdir("$externalBuildDeps") eq 1 or die ("failed to chdir to external directory\n"); + chdir("$externalBuildDeps/autoconf-2-69") eq 1 or die ("failed to chdir to external directory\n"); system("tar xzf autoconf-$autoconfVersion.tar.gz") eq 0 or die ("failed to extract autoconf\n"); chdir("$autoconfDir") eq 1 or die ("failed to chdir to autoconf directory\n"); @@ -35,7 +35,7 @@ if ($externalBuildDeps ne "") if (!(-d "$automakeDir")) { - chdir("$externalBuildDeps") eq 1 or die ("failed to chdir to external directory\n"); + chdir("$externalBuildDeps/automake-1-15") eq 1 or die ("failed to chdir to external directory\n"); system("tar xzf automake-$automakeVersion.tar.gz") eq 0 or die ("failed to extract automake\n"); chdir("$automakeDir") eq 1 or die ("failed to chdir to automake directory\n"); @@ -50,7 +50,7 @@ if ($externalBuildDeps ne "") if (!(-d "$libtoolDir")) { - chdir("$externalBuildDeps") eq 1 or die ("failed to chdir to external directory\n"); + chdir("$externalBuildDeps/libtool-2-4-6") eq 1 or die ("failed to chdir to external directory\n"); system("tar xzf libtool-$libtoolVersion.tar.gz") eq 0 or die ("failed to extract libtool\n"); chdir("$libtoolDir") eq 1 or die ("failed to chdir to libtool directory\n");