Skip to content

Commit f9b5bf6

Browse files
committed
fix: nvidia builds
`libtirpc` fails to build with newer gcc-15 from wolfi-base. Pin to use `gcc-14`. Fixes: #719 Signed-off-by: Noel Georgi <[email protected]>
1 parent 5de8e28 commit f9b5bf6

File tree

11 files changed

+47
-8
lines changed

11 files changed

+47
-8
lines changed

misc/glibc/pkg.yaml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,18 @@ variant: scratch
33
shell: /bin/bash
44
install:
55
- build-base
6+
- gcc-14
67
- bash
78
- gawk
89
- bison
910
- python3
1011
dependencies:
1112
- image: cgr.dev/chainguard/wolfi-base@{{ .WOLFI_BASE_REF }}
1213
steps:
13-
- sources:
14+
- env:
15+
CC: gcc-14
16+
CXX: g++-14
17+
sources:
1418
- url: https://src.fedoraproject.org/lookaside/pkgs/glibc/glibc-{{ .GLIBC_VERSION }}-8-g1e0e33e1b1.tar.xz/sha512/449e3d4f6b59bfde2175c5d1be71447b084e0b12b176518b65fd9b0ac8430766b25416a173fe3efd47462bc1719d59a051e7eed9544e0fba9165dd86f69ee0b9/glibc-{{ .GLIBC_VERSION }}-8-g1e0e33e1b1.tar.xz
1519
destination: glibc.tar.xz
1620
sha256: {{ .GLIBC_SHA256 }}

nvidia-gpu/nvidia-container-toolkit/nvidia-container-cli/elfutils/pkg.yaml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,18 @@ variant: scratch
33
shell: /bin/bash
44
install:
55
- build-base
6+
- gcc-14
67
- bash
78
- m4
89
dependencies:
910
- image: cgr.dev/chainguard/wolfi-base@{{ .WOLFI_BASE_REF }}
1011
- stage: zlib
1112
from: /rootfs
1213
steps:
13-
- sources:
14+
- env:
15+
CC: gcc-14
16+
CXX: g++-14
17+
sources:
1418
- url: https://sourceware.org/elfutils/ftp/{{ .ELFUTILS_VERSION }}/elfutils-{{ .ELFUTILS_VERSION }}.tar.bz2
1519
destination: elfutils.tar.bz2
1620
sha256: {{ .ELFUTILS_SHA256 }}

nvidia-gpu/nvidia-container-toolkit/nvidia-container-cli/libcap2/pkg.yaml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,16 @@ variant: scratch
33
shell: /bin/bash
44
install:
55
- build-base
6+
- gcc-14
67
- bash
78
- patch
89
dependencies:
910
- image: cgr.dev/chainguard/wolfi-base@{{ .WOLFI_BASE_REF }}
1011
steps:
11-
- sources:
12+
- env:
13+
CC: gcc-14
14+
CXX: g++-14
15+
sources:
1216
- url: https://kernel.org/pub/linux/libs/security/linux-privs/libcap2/libcap-{{ .LIBCAP_VERSION }}.tar.xz
1317
destination: libcap.tar.xz
1418
sha256: {{ .LIBCAP_SHA256 }}

nvidia-gpu/nvidia-container-toolkit/nvidia-container-cli/libseccomp/pkg.yaml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,16 @@ variant: scratch
33
shell: /bin/bash
44
install:
55
- build-base
6+
- gcc-14
67
- bash
78
- gperf
89
dependencies:
910
- image: cgr.dev/chainguard/wolfi-base@{{ .WOLFI_BASE_REF }}
1011
steps:
11-
- sources:
12+
- env:
13+
CC: gcc-14
14+
CXX: g++-14
15+
sources:
1216
- url: https://github.com/seccomp/libseccomp/releases/download/v{{ .LIBSECCOMP_VERSION }}/libseccomp-{{ .LIBSECCOMP_VERSION }}.tar.gz
1317
destination: libseccomp.tar.gz
1418
sha256: {{ .LIBSECCOMP_SHA256 }}

nvidia-gpu/nvidia-container-toolkit/nvidia-container-cli/libtirpc/pkg.yaml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,16 @@ variant: scratch
44
shell: /bin/bash
55
install:
66
- build-base
7+
- gcc-14
78
- bash
89
- autoconf
910
dependencies:
1011
- image: cgr.dev/chainguard/wolfi-base@{{ .WOLFI_BASE_REF }}
1112
steps:
12-
- sources:
13+
- env:
14+
CC: gcc-14
15+
CXX: g++-14
16+
sources:
1317
- url: https://src.fedoraproject.org/lookaside/extras/libtirpc/libtirpc-{{ .LIBTIRPC_VERSION | replace "-" "." }}.tar.bz2/sha512/df0781a74ff9ded2d3c4f5eb7e05496b9f58eac8060c02c68331dc14c4a00304dcd19f46836f5756fe0d9d27095fd463d42dd696fcdff891516711b7d63deabe/libtirpc-{{ .LIBTIRPC_VERSION | replace "-" "." }}.tar.bz2
1418
destination: libtirpc.tar.bz2
1519
sha256: {{ .LIBTIRPC_SHA256 }}

nvidia-gpu/nvidia-container-toolkit/nvidia-container-cli/lts/pkg.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ variant: scratch
33
shell: /bin/bash
44
install:
55
- build-base
6+
- gcc-14
67
- bash
78
- go
89
- coreutils
@@ -33,6 +34,8 @@ steps:
3334
sha256: {{ .LIBNVIDIA_CONTAINER_SHA256 }}
3435
sha512: {{ .LIBNVIDIA_CONTAINER_SHA512 }}
3536
env:
37+
CC: gcc-14
38+
CXX: g++-14
3639
SOURCE_DATE_EPOCH: {{ .BUILD_ARG_SOURCE_DATE_EPOCH }}
3740
REVISION: {{ .LIBNVIDIA_CONTAINER_REF }}
3841
LIB_VERSION: {{ .LIBNVIDIA_CONTAINER_VERSION | replace "v" "" }}

nvidia-gpu/nvidia-container-toolkit/nvidia-container-cli/production/pkg.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ variant: scratch
33
shell: /bin/bash
44
install:
55
- build-base
6+
- gcc-14
67
- bash
78
- go
89
- coreutils
@@ -33,6 +34,8 @@ steps:
3334
sha256: {{ .LIBNVIDIA_CONTAINER_SHA256 }}
3435
sha512: {{ .LIBNVIDIA_CONTAINER_SHA512 }}
3536
env:
37+
CC: gcc-14
38+
CXX: g++-14
3639
SOURCE_DATE_EPOCH: {{ .BUILD_ARG_SOURCE_DATE_EPOCH }}
3740
REVISION: {{ .LIBNVIDIA_CONTAINER_REF }}
3841
LIB_VERSION: {{ .LIBNVIDIA_CONTAINER_VERSION | replace "v" "" }}

nvidia-gpu/nvidia-container-toolkit/nvidia-container-cli/zlib/pkg.yaml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,15 @@ variant: scratch
33
shell: /bin/bash
44
install:
55
- build-base
6+
- gcc-14
67
- bash
78
dependencies:
89
- image: cgr.dev/chainguard/wolfi-base@{{ .WOLFI_BASE_REF }}
910
steps:
10-
- sources:
11+
- env:
12+
CC: gcc-14
13+
CXX: g++-14
14+
sources:
1115
- url: https://zlib.net/fossils/zlib-{{ .ZLIB_VERSION }}.tar.gz
1216
destination: zlib.tar.gz
1317
sha256: {{ .ZLIB_SHA256 }}

nvidia-gpu/nvidia-container-toolkit/nvidia-container-runtime/pkg.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ variant: scratch
33
shell: /bin/bash
44
install:
55
- build-base
6+
- gcc-14
67
- bash
78
- go
89
- patch
@@ -15,6 +16,8 @@ steps:
1516
sha256: {{ .CONTAINER_TOOLKIT_SHA256 }}
1617
sha512: {{ .CONTAINER_TOOLKIT_SHA512 }}
1718
env:
19+
CC: gcc-14
20+
CXX: g++-14
1821
GIT_COMMIT: {{ substr 0 7 .CONTAINER_TOOLKIT_REF }} # build is using short sha
1922
prepare:
2023
- |

nvidia-gpu/nvidia-container-toolkit/nvidia-pkgs/lts/pkg.yaml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,10 @@ dependencies:
99
# so any stage depending on nvidia-pkgs will have the updated cache
1010
- stage: glibc
1111
steps:
12-
- sources:
12+
- env:
13+
CC: gcc-14
14+
CXX: g++-14
15+
sources:
1316
# {{ if eq .ARCH "aarch64" }} This in fact is YAML comment, but Go templating instruction is evaluated by bldr
1417
- url: https://developer.download.nvidia.com/compute/nvidia-driver/redist/nvidia_driver/linux-sbsa/nvidia_driver-linux-sbsa-{{ .NVIDIA_DRIVER_LTS_VERSION }}-archive.tar.xz
1518
destination: nvidia.tar.xz

0 commit comments

Comments
 (0)