diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2025-07-01 20:38:24 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2025-07-03 10:40:16 +0100 |
commit | 204653a519b341353dc129b1471291bb202460e5 (patch) | |
tree | 924e8e2914cba1d864544b7699d7a34179ec33b4 /meta/lib/oe/utils.py | |
parent | 243d54fd466f5f852cc0fdcce57997918ce35f32 (diff) | |
download | poky-204653a519b341353dc129b1471291bb202460e5.tar.gz |
uninative/utils: Drop workarounds for gcc 4.8/4.9
We require at least gcc 8.0 in sanity.bbclass so drop the 4.8/4.9
special case handling in uninative.
(From OE-Core rev: 552e037bf598ac523f35b69d2dafc99e5ba59c5f)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib/oe/utils.py')
-rw-r--r-- | meta/lib/oe/utils.py | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/meta/lib/oe/utils.py b/meta/lib/oe/utils.py index a11db5f3cd..0378071b5c 100644 --- a/meta/lib/oe/utils.py +++ b/meta/lib/oe/utils.py | |||
@@ -444,32 +444,6 @@ def get_host_compiler_version(d, taskcontextonly=False): | |||
444 | version = match.group(1) | 444 | version = match.group(1) |
445 | return compiler, version | 445 | return compiler, version |
446 | 446 | ||
447 | |||
448 | def host_gcc_version(d, taskcontextonly=False): | ||
449 | import re, subprocess | ||
450 | |||
451 | if taskcontextonly and d.getVar('BB_WORKERCONTEXT') != '1': | ||
452 | return | ||
453 | |||
454 | compiler = d.getVar("BUILD_CC") | ||
455 | # Get rid of ccache since it is not present when parsing. | ||
456 | if compiler.startswith('ccache '): | ||
457 | compiler = compiler[7:] | ||
458 | try: | ||
459 | env = os.environ.copy() | ||
460 | env["PATH"] = d.getVar("PATH") | ||
461 | output = subprocess.check_output("%s --version" % compiler, \ | ||
462 | shell=True, env=env, stderr=subprocess.STDOUT).decode("utf-8") | ||
463 | except subprocess.CalledProcessError as e: | ||
464 | bb.fatal("Error running %s --version: %s" % (compiler, e.output.decode("utf-8"))) | ||
465 | |||
466 | match = re.match(r".* (\d+\.\d+)\.\d+.*", output.split('\n')[0]) | ||
467 | if not match: | ||
468 | bb.fatal("Can't get compiler version from %s --version output" % compiler) | ||
469 | |||
470 | version = match.group(1) | ||
471 | return "-%s" % version if version in ("4.8", "4.9") else "" | ||
472 | |||
473 | @bb.parse.vardepsexclude("DEFAULTTUNE_MULTILIB_ORIGINAL", "OVERRIDES") | 447 | @bb.parse.vardepsexclude("DEFAULTTUNE_MULTILIB_ORIGINAL", "OVERRIDES") |
474 | def get_multilib_datastore(variant, d): | 448 | def get_multilib_datastore(variant, d): |
475 | localdata = bb.data.createCopy(d) | 449 | localdata = bb.data.createCopy(d) |