From e2b035dfd7b51b6affe59648696afcb3580baad9 Mon Sep 17 00:00:00 2001 From: DmitriyMusatkin Date: Fri, 17 Jan 2025 14:20:10 -0800 Subject: [PATCH 01/12] gcc default --- builder/core/data.py | 1 + 1 file changed, 1 insertion(+) diff --git a/builder/core/data.py b/builder/core/data.py index 46b570e51..df88fa7d0 100644 --- a/builder/core/data.py +++ b/builder/core/data.py @@ -572,6 +572,7 @@ class PKG_TOOLS(Enum): 'yum_compiler_packages': ['gcc', 'gcc-c++'], 'versions': { + 'default': {}, '4.8': { # ASan has been broken on 4.8 GCC version distributed on Ubuntu # and will unlikely to get fixed upstream. so turn it off. From ef91d9fd94d9e094043df6dccbc4966390db7a05 Mon Sep 17 00:00:00 2001 From: DmitriyMusatkin Date: Fri, 17 Jan 2025 14:49:55 -0800 Subject: [PATCH 02/12] add debug print --- builder/core/toolchain.py | 1 + 1 file changed, 1 insertion(+) diff --git a/builder/core/toolchain.py b/builder/core/toolchain.py index c33fc9815..2dfe2e6e0 100644 --- a/builder/core/toolchain.py +++ b/builder/core/toolchain.py @@ -14,6 +14,7 @@ def _compiler_version(cc): if current_os() != 'windows': result = util.run_command(cc, '--version', quiet=True) lines = result.output.split('\n') + print(lines) for text in lines: # Apple clang From a8eb359b8509023e9db9dd4a6efe2c7fc5fe7cf6 Mon Sep 17 00:00:00 2001 From: DmitriyMusatkin Date: Fri, 17 Jan 2025 15:04:14 -0800 Subject: [PATCH 03/12] lets try a different method --- builder/core/toolchain.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/builder/core/toolchain.py b/builder/core/toolchain.py index 2dfe2e6e0..45dc6b1df 100644 --- a/builder/core/toolchain.py +++ b/builder/core/toolchain.py @@ -33,6 +33,12 @@ def _compiler_version(cc): m = re.match(r'gcc .+ (\d+)\.', text) if m: return 'gcc', m.group(1) + # other gcc + m = re.match(r'gcc .+', text) + if m: + result = util.run_command(cc, '-dumpfullversion -dumpversion', quiet=True) + if result.returncode == 0: + return 'gcc', result.output.split('\n')[0] return None, None From bfb363ed8360cf81f08d4a3649cc66f07253abbe Mon Sep 17 00:00:00 2001 From: DmitriyMusatkin Date: Fri, 17 Jan 2025 15:07:09 -0800 Subject: [PATCH 04/12] this --- builder/core/toolchain.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/builder/core/toolchain.py b/builder/core/toolchain.py index 45dc6b1df..f56436495 100644 --- a/builder/core/toolchain.py +++ b/builder/core/toolchain.py @@ -14,7 +14,6 @@ def _compiler_version(cc): if current_os() != 'windows': result = util.run_command(cc, '--version', quiet=True) lines = result.output.split('\n') - print(lines) for text in lines: # Apple clang @@ -38,6 +37,8 @@ def _compiler_version(cc): if m: result = util.run_command(cc, '-dumpfullversion -dumpversion', quiet=True) if result.returncode == 0: + lines2 = result.output.split('\n') + print(lines2) return 'gcc', result.output.split('\n')[0] return None, None From 8bece50fbb04434aed833d40ed230e530ee26f27 Mon Sep 17 00:00:00 2001 From: DmitriyMusatkin Date: Fri, 17 Jan 2025 15:10:32 -0800 Subject: [PATCH 05/12] debugg --- builder/core/toolchain.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/builder/core/toolchain.py b/builder/core/toolchain.py index f56436495..dd5d63c91 100644 --- a/builder/core/toolchain.py +++ b/builder/core/toolchain.py @@ -33,9 +33,11 @@ def _compiler_version(cc): if m: return 'gcc', m.group(1) # other gcc - m = re.match(r'gcc .+', text) + m = re.match(r'^gcc', text) if m: + print("got here") result = util.run_command(cc, '-dumpfullversion -dumpversion', quiet=True) + print(result) if result.returncode == 0: lines2 = result.output.split('\n') print(lines2) From 6ac148b1724a73e30041b7ce18c3ba9ca44f449f Mon Sep 17 00:00:00 2001 From: DmitriyMusatkin Date: Fri, 17 Jan 2025 15:11:49 -0800 Subject: [PATCH 06/12] ok --- builder/core/toolchain.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/builder/core/toolchain.py b/builder/core/toolchain.py index dd5d63c91..fb236f9f2 100644 --- a/builder/core/toolchain.py +++ b/builder/core/toolchain.py @@ -33,7 +33,9 @@ def _compiler_version(cc): if m: return 'gcc', m.group(1) # other gcc + print(text) m = re.match(r'^gcc', text) + print(m) if m: print("got here") result = util.run_command(cc, '-dumpfullversion -dumpversion', quiet=True) From 34d1e58587473156512b3ee24c352b48eaffa21a Mon Sep 17 00:00:00 2001 From: DmitriyMusatkin Date: Fri, 17 Jan 2025 15:13:23 -0800 Subject: [PATCH 07/12] ugh --- builder/core/toolchain.py | 1 + 1 file changed, 1 insertion(+) diff --git a/builder/core/toolchain.py b/builder/core/toolchain.py index fb236f9f2..c053294d2 100644 --- a/builder/core/toolchain.py +++ b/builder/core/toolchain.py @@ -14,6 +14,7 @@ def _compiler_version(cc): if current_os() != 'windows': result = util.run_command(cc, '--version', quiet=True) lines = result.output.split('\n') + print(lines) for text in lines: # Apple clang From 5adf259dec88bf81778f33603ece521f9c530ee3 Mon Sep 17 00:00:00 2001 From: DmitriyMusatkin Date: Thu, 23 Jan 2025 09:43:58 -0800 Subject: [PATCH 08/12] override defaults --- builder/core/data.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/builder/core/data.py b/builder/core/data.py index df88fa7d0..80e048ee2 100644 --- a/builder/core/data.py +++ b/builder/core/data.py @@ -572,7 +572,13 @@ class PKG_TOOLS(Enum): 'yum_compiler_packages': ['gcc', 'gcc-c++'], 'versions': { - 'default': {}, + 'default': { + 'c': "gcc", + 'cxx': "g++", + 'compiler_packages': ['gcc', 'g++'], + + 'apt_compiler_packages': ['gcc', 'g++', 'libstdc++-dev'], + }, '4.8': { # ASan has been broken on 4.8 GCC version distributed on Ubuntu # and will unlikely to get fixed upstream. so turn it off. From 42bf0dd902e3858bae780a19dab8ea10fc9a6711 Mon Sep 17 00:00:00 2001 From: DmitriyMusatkin Date: Thu, 23 Jan 2025 10:11:24 -0800 Subject: [PATCH 09/12] this --- builder/core/data.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/builder/core/data.py b/builder/core/data.py index 80e048ee2..6878ae01b 100644 --- a/builder/core/data.py +++ b/builder/core/data.py @@ -573,11 +573,11 @@ class PKG_TOOLS(Enum): 'versions': { 'default': { - 'c': "gcc", - 'cxx': "g++", - 'compiler_packages': ['gcc', 'g++'], + '!c': "gcc", + '!cxx': "g++", + '!compiler_packages': ['gcc', 'g++'], - 'apt_compiler_packages': ['gcc', 'g++', 'libstdc++-dev'], + '!apt_compiler_packages': ['gcc', 'g++', 'libstdc++-dev'], }, '4.8': { # ASan has been broken on 4.8 GCC version distributed on Ubuntu From 880c274002249c5a4dee072d7378e254fd3f5ed6 Mon Sep 17 00:00:00 2001 From: DmitriyMusatkin Date: Thu, 23 Jan 2025 10:13:03 -0800 Subject: [PATCH 10/12] or that --- builder/core/data.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/builder/core/data.py b/builder/core/data.py index 6878ae01b..2ce27aea3 100644 --- a/builder/core/data.py +++ b/builder/core/data.py @@ -575,9 +575,8 @@ class PKG_TOOLS(Enum): 'default': { '!c': "gcc", '!cxx': "g++", - '!compiler_packages': ['gcc', 'g++'], - - '!apt_compiler_packages': ['gcc', 'g++', 'libstdc++-dev'], + '!compiler_packages': [], + '!apt_compiler_packages': [], }, '4.8': { # ASan has been broken on 4.8 GCC version distributed on Ubuntu From 103273749f2d5a3d4b200f3b1e35f742e61dbf66 Mon Sep 17 00:00:00 2001 From: DmitriyMusatkin Date: Thu, 23 Jan 2025 10:14:42 -0800 Subject: [PATCH 11/12] remove crap --- builder/core/toolchain.py | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/builder/core/toolchain.py b/builder/core/toolchain.py index c053294d2..c33fc9815 100644 --- a/builder/core/toolchain.py +++ b/builder/core/toolchain.py @@ -14,7 +14,6 @@ def _compiler_version(cc): if current_os() != 'windows': result = util.run_command(cc, '--version', quiet=True) lines = result.output.split('\n') - print(lines) for text in lines: # Apple clang @@ -33,18 +32,6 @@ def _compiler_version(cc): m = re.match(r'gcc .+ (\d+)\.', text) if m: return 'gcc', m.group(1) - # other gcc - print(text) - m = re.match(r'^gcc', text) - print(m) - if m: - print("got here") - result = util.run_command(cc, '-dumpfullversion -dumpversion', quiet=True) - print(result) - if result.returncode == 0: - lines2 = result.output.split('\n') - print(lines2) - return 'gcc', result.output.split('\n')[0] return None, None From f0efc9a7b70882bbd1086c810193b303465ee17a Mon Sep 17 00:00:00 2001 From: DmitriyMusatkin Date: Thu, 23 Jan 2025 11:01:55 -0800 Subject: [PATCH 12/12] downgrade ubuntu --- .github/workflows/sanity-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/sanity-test.yml b/.github/workflows/sanity-test.yml index 61722b7f8..aae3d7ce1 100644 --- a/.github/workflows/sanity-test.yml +++ b/.github/workflows/sanity-test.yml @@ -297,7 +297,7 @@ jobs: - musllinux-1-1-x64 needs: package - runs-on: ubuntu-24.04 + runs-on: ubuntu-22.04 # temporarily downgrade to old ubuntu as 24.04 likes to segfault in the middle of the build steps: - uses: aws-actions/configure-aws-credentials@v4 with: