TheCloud/dwarfs
1
0
Fork 0
mirror of https://github.com/mhx/dwarfs.git synced 2025-09-14 14:59:52 -04:00
Code Issues Packages Projects Releases Wiki Activity

chore: try ubuntu noble build again

Browse Source
This commit is contained in:
Marcus Holland-Moritz 2024-04-05 19:53:06 +02:00
parent 7287ef7aea
commit 76b9702e03
3 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
.docker/Dockerfile.ubuntu
View File

@ -1,11 +1,11 @@
# syntax=docker/dockerfile:1 # syntax=docker/dockerfile:1
ARG ARCH=amd64 ARG ARCH=amd64
FROM $ARCH/ubuntu:23.10 FROM $ARCH/ubuntu:24.04
RUN apt update RUN apt update
RUN apt upgrade -y RUN apt upgrade -y
RUN apt install -y gnupg wget software-properties-common RUN apt install -y gnupg wget software-properties-common
RUN wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | gpg --dearmor - | tee /etc/apt/trusted.gpg.d/kitware.gpg >/dev/null # RUN wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | gpg --dearmor - | tee /etc/apt/trusted.gpg.d/kitware.gpg >/dev/null
RUN apt-add-repository 'deb https://apt.kitware.com/ubuntu/ jammy main' # RUN apt-add-repository 'deb https://apt.kitware.com/ubuntu/ jammy main'
RUN apt install -y \ RUN apt install -y \
bash-completion \ bash-completion \
vim \ vim \
@ -17,9 +17,12 @@ RUN apt install -y \
g++-12 \ g++-12 \
gcc-13 \ gcc-13 \
g++-13 \ g++-13 \
gcc-14 \
g++-14 \
clang-15 \ clang-15 \
clang-16 \ clang-16 \
clang-17 \ clang-17 \
clang-18 \
git \ git \
zstd \ zstd \
ccache \ ccache \

6
.docker/build-linux.sh
View File

@ -15,8 +15,8 @@ rm -rf build
mkdir build mkdir build
cd build cd build
GCC_VERSION=13 GCC_VERSION=14
CLANG_VERSION=17 CLANG_VERSION=18
case "-$BUILD_TYPE-" in case "-$BUILD_TYPE-" in
*-ninja-*) *-ninja-*)
@ -56,7 +56,7 @@ case "-$BUILD_TYPE-" in
export COMPILER=clang export COMPILER=clang
;; ;;
*-oldclang-*) *-oldclang-*)
export CC=clang-15 CXX=clang++-15 export CC=clang-16 CXX=clang++-16
;; ;;
*) *)
echo "missing compiler in: $BUILD_TYPE" echo "missing compiler in: $BUILD_TYPE"

3
.docker/install-static-libs.sh
View File

@ -6,8 +6,9 @@ cd "$HOME"
mkdir pkgs mkdir pkgs
cd pkgs cd pkgs
# TODO: move to gcc-14 once libunwind compiles with it
GCC_VERSION=13 GCC_VERSION=13
CLANG_VERSION=17 CLANG_VERSION=18
FILE_VERSION=5.45 FILE_VERSION=5.45
FILE_SHA512=12611a59ff766c22a55db4b4a9f80f95a0a2e916a1d8593612c6ead32c247102a8fdc23693c6bf81bda9b604d951a62c0051e91580b1b79e190a3504c0efc20a FILE_SHA512=12611a59ff766c22a55db4b4a9f80f95a0a2e916a1d8593612c6ead32c247102a8fdc23693c6bf81bda9b604d951a62c0051e91580b1b79e190a3504c0efc20a