diff --git a/uppbox/MakePosixInstall/Main.cpp b/uppbox/MakePosixInstall/Main.cpp index 34c3bef64..a0f67e3ef 100644 --- a/uppbox/MakePosixInstall/Main.cpp +++ b/uppbox/MakePosixInstall/Main.cpp @@ -127,7 +127,7 @@ CONSOLE_APP_MAIN #endif #ifdef PLATFORM_LINUX - Syx(GetHomeDirFile("bin/umk") + " ./uppsrc umk GCC32 " OPTS + "+NOSSL " + release + "/umks32"); + Syx(GetHomeDirFile("bin/umk") + " ./uppsrc umk GCC32 " OPTS + release + "/umks32"); #endif Syx(GetHomeDirFile("bin/umk") + " ./uppsrc umk GCC +NOMM -rvsM"); diff --git a/uppsrc/Core/Mt.cpp b/uppsrc/Core/Mt.cpp index a3463199e..33b5f3d41 100644 --- a/uppsrc/Core/Mt.cpp +++ b/uppsrc/Core/Mt.cpp @@ -258,7 +258,7 @@ void Thread::DumpDiagnostics() { #ifdef PLATFORM_LINUX INTERLOCKED { - int s, i; + int i; void *stkaddr; pthread_attr_t attr[1]; diff --git a/uppsrc/umk/UppHub.cpp b/uppsrc/umk/UppHub.cpp index 985f6a7dd..601bf54ad 100644 --- a/uppsrc/umk/UppHub.cpp +++ b/uppsrc/umk/UppHub.cpp @@ -30,14 +30,22 @@ Value UppHubDlg::LoadJson(const String& url) if(IsNull(s)) { PutVerbose("Fetching UppHub metadata from " << url); +#ifdef PLATFORM_POSIX + s = Sys("curl --silent " + url); + if (IsNull(s)) { + String msg = "Failed to execute UppHub download nests request."; + return ErrorValue(msg); + } +#else HttpRequest r(url); r.Execute(); if (!r.IsSuccess()) { String msg = "Failed to execute UppHub download nests request with error code " + IntStr(r.GetStatusCode()) + "."; return ErrorValue(msg); } - + s = r.GetContent(); +#endif } Value v = ParseJSON(s); diff --git a/uppsrc/umk/umk.upp b/uppsrc/umk/umk.upp index 55061173e..9ea042391 100644 --- a/uppsrc/umk/umk.upp +++ b/uppsrc/umk/umk.upp @@ -3,7 +3,7 @@ description "Commandline U++ package/assembly builder\377"; uses ide\Builders; -uses(!NOSSL) Core/SSL; +uses(!POSIX) Core/SSL; file umake.h, @@ -16,6 +16,5 @@ file mainconfig "" = "", - "" = "NOMM", - "" = "NOSSL"; + "" = "NOMM";