diff options
| author | Christian Dreihsig <christian.dreihsig@t-online.de> | 2020-04-12 22:37:49 +0200 |
|---|---|---|
| committer | Christian Dreihsig <christian.dreihsig@t-online.de> | 2020-04-13 19:27:28 +0200 |
| commit | ebc19c6bd5ff3dc424ef1b6d7b5bdb0fa23ac7b8 (patch) | |
| tree | dd042ab38899795532a84e0a797f2df0ab8be4e0 /net/boinc/patches | |
| parent | ed903bfd574e13803ba127d16520ea0b72e91f34 (diff) | |
boinc: new upstream version, adjustments
* new upstream version 7.16.6
* fixing platform identifier for openwrt x86
(boinc issue https://github.com/BOINC/boinc/issues/3595)
* protected configuration from update
Signed-off-by: Christian Dreihsig <christian.dreihsig@t-online.de>
Diffstat (limited to 'net/boinc/patches')
| -rw-r--r-- | net/boinc/patches/002-hosttypeRespected | 51 |
1 files changed, 51 insertions, 0 deletions
diff --git a/net/boinc/patches/002-hosttypeRespected b/net/boinc/patches/002-hosttypeRespected new file mode 100644 index 000000000..6702b572e --- /dev/null +++ b/net/boinc/patches/002-hosttypeRespected @@ -0,0 +1,51 @@ +Index: boinc-client_release-7.16-7.16.6/client/cs_platforms.cpp +=================================================================== +--- boinc-client_release-7.16-7.16.6.orig/client/cs_platforms.cpp ++++ boinc-client_release-7.16-7.16.6/client/cs_platforms.cpp +@@ -76,6 +76,21 @@ void CLIENT_STATE::add_platform(const ch + // + void CLIENT_STATE::detect_platforms() { + ++// if specified - use it ++#ifdef HOSTTYPE ++ add_platform(HOSTTYPE); ++#endif ++ ++// if specified - use it ++#ifdef HOSTTYPEALT ++ add_platform(HOSTTYPEALT); ++#endif ++ ++// if both the hosttype and its alternative are specified, ++// there is no need to look further and one should go directly ++// to the inspection of the cc_config.xml data ++#if !defined(HOSTTYPE) || !defined(HOSTTYPEALT) ++ + #if defined(_WIN32) && !defined(__CYGWIN32__) + #if defined(_WIN64) && defined(_M_X64) + add_platform("windows_x86_64"); +@@ -206,15 +221,6 @@ void CLIENT_STATE::detect_platforms() { + add_platform("i686-pc-linux-gnu"); + } + +- if (!(support64 || support32)) { +- // Something went wrong. Assume HOSTTYPE and HOSTTYPEALT +- // are correct +- add_platform(HOSTTYPE); +-#ifdef HOSTTYPEALT +- add_platform(HOSTTYPEALT); +-#endif +- } +- + #elif defined(sun) + // Check if we can run 64-bit binaries... + // this assumes there isn't a 64-bit only solaris. (Every 64-bit solaris can run 32 bit binaries) +@@ -290,6 +296,8 @@ void CLIENT_STATE::detect_platforms() { + #endif + + #endif ++ ++#endif + + if (cc_config.no_alt_platform) { + PLATFORM p = platforms[0]; |