From 82e808ce95f2e4a755cf2dbf12d7cda5d31eae3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dirk=20M=C3=BCller?= Date: Tue, 7 May 2024 12:33:29 +0200 Subject: [PATCH 1/2] Fix symlinks in gcc container --- src/bci_build/package/gcc.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bci_build/package/gcc.py b/src/bci_build/package/gcc.py index 4aa2a8a0d..7ec9f5053 100644 --- a/src/bci_build/package/gcc.py +++ b/src/bci_build/package/gcc.py @@ -67,7 +67,7 @@ def _is_main_gcc(os_version: OsVersion, gcc_version: _GCC_VERSIONS) -> bool: rf"""# symlink all versioned gcc & g++ binaries to unversioned # ones in /usr/local/bin so that plain gcc works {DOCKERFILE_RUN} for gcc_bin in $(rpm -ql {gcc_pkg} {gpp} |grep ^/usr/bin/ ); do \ - ln -f $gcc_bin $(echo "$gcc_bin" | sed -e 's|/usr/bin/|/usr/local/bin/|' -e 's|-{gcc_version}$||'); \ + ln -sf $gcc_bin $(echo "$gcc_bin" | sed -e 's|/usr/bin/|/usr/local/bin/|' -e 's|-{gcc_version}$||'); \ done """ if not _is_main_gcc(os_version, gcc_version) From 159c5b0937cd5f5f1eb28d510c5d5cc210403ff7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dirk=20M=C3=BCller?= Date: Tue, 7 May 2024 12:35:44 +0200 Subject: [PATCH 2/2] Install gawk in gcc container Cannot even build hello world without gawk. also it is a POSIX standard package. --- src/bci_build/package/gcc.py | 1 + 1 file changed, 1 insertion(+) diff --git a/src/bci_build/package/gcc.py b/src/bci_build/package/gcc.py index 7ec9f5053..40981e954 100644 --- a/src/bci_build/package/gcc.py +++ b/src/bci_build/package/gcc.py @@ -46,6 +46,7 @@ def _is_main_gcc(os_version: OsVersion, gcc_version: _GCC_VERSIONS) -> bool: (gcc_pkg := f"gcc{gcc_version}"), (gpp := f"{gcc_pkg}-c++"), "make", + "gawk", ] + (["gcc", "gcc-c++"] if _is_main_gcc(os_version, gcc_version) else []) ),