diff options
author | Martchus | 2024-03-18 13:11:05 +0100 |
---|---|---|
committer | Martchus | 2024-03-18 13:15:08 +0100 |
commit | 9bb3176e5460a964ddb481ac0707fc41b0b35b14 (patch) | |
tree | df73b7c6ebcf47ba04fc1d14e441016113c58eeb /disable-version-check.patch | |
parent | c1a356f56b54dc5b7e2a0337bec31610fe17c4d5 (diff) | |
download | aur-9bb3176e5460a964ddb481ac0707fc41b0b35b14.tar.gz |
Update to 1.84.0
Diffstat (limited to 'disable-version-check.patch')
-rw-r--r-- | disable-version-check.patch | 58 |
1 files changed, 32 insertions, 26 deletions
diff --git a/disable-version-check.patch b/disable-version-check.patch index 3469b005b9d2..4226e1d62336 100644 --- a/disable-version-check.patch +++ b/disable-version-check.patch @@ -1,27 +1,33 @@ ---- a/tools/build/src/tools/common.jam 2019-09-18 16:03:02.035995695 +0200 -+++ b/tools/build/src/tools/common.jam 2019-09-18 16:03:36.386156355 +0200 -@@ -974,16 +974,16 @@ - } - - # From GCC 5, versioning changes and minor becomes patch -- if $(tag) = gcc && [ numbers.less 4 $(version[1]) ] -- { -- version = $(version[1]) ; -- } -+ #if $(tag) = gcc && [ numbers.less 4 $(version[1]) ] -+ #{ -+ # version = $(version[1]) ; -+ #} +--- a/tools/build/src/tools/common.jam 2023-02-03 10:57:59.385098144 +0100 ++++ b/tools/build/src/tools/common.jam 2023-02-03 11:00:34.982146918 +0100 +@@ -1127,18 +1127,18 @@ + import $(toolset) ; + local tool-version = [ $(toolset).get-full-version $(command) ] ; - # Ditto, from Clang 4 -- if ( $(tag) = clang || $(tag) = clangw ) && [ numbers.less 3 $(version[1]) ] -- { -- version = $(version[1]) ; -- } -+ #if ( $(tag) = clang || $(tag) = clangw ) && [ numbers.less 3 $(version[1]) ] -+ #{ -+ # version = $(version[1]) ; -+ #} - - # On intel, version is not added, because it does not matter and it is the - # version of vc used as backend that matters. Ideally, we should encode the +- import version ; +- if ! [ version.version-compatible [ SPLIT_BY_CHARACTERS $(version) : . ] +- : [ SPLIT_BY_CHARACTERS $(tool-version) : . ] ] +- { +- errors.error toolset $(toolset) "initialization:" +- : version '$(version)' requested but +- '$(tool)-$(version)' not found and version +- '$(tool-version:J=.)' of default '$(command)' +- does not match +- : initialized from [ errors.nearest-user-location ] +- ; +- } ++ #import version ; ++ #if ! [ version.version-compatible [ SPLIT_BY_CHARACTERS $(version) : . ] ++ # : [ SPLIT_BY_CHARACTERS $(tool-version) : . ] ] ++ #{ ++ # errors.error toolset $(toolset) "initialization:" ++ # : version '$(version)' requested but ++ # '$(tool)-$(version)' not found and version ++ # '$(tool-version:J=.)' of default '$(command)' ++ # does not match ++ # : initialized from [ errors.nearest-user-location ] ++ # ; ++ #} + } + #3) default: no command and no version specified, try using "$(tool)" + else |