Skip to content

Upgrade the gcc and g++ to version 12 to support Cpp20 features #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 31 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
7a987ba
Upgrad the gcc and g++ to version 12 to support Cpp20 features
Davknapp Nov 19, 2024
7cb4aa4
Get Compiler Version from argument
Davknapp Nov 19, 2024
3407ac8
Make it work befor making it pretty
Davknapp Nov 19, 2024
b281659
Add repository to find gcc and g++ versions
Davknapp Nov 19, 2024
20ecac9
Try to use Ubuntu 22.04 befor manually installing g++12
Davknapp Nov 19, 2024
e458b34
Remove fi
Davknapp Nov 19, 2024
5fad755
manually install g++12
Davknapp Nov 20, 2024
fc780ce
Get gcc from repo
Davknapp Nov 20, 2024
2349300
install gcc before installing VTK
Davknapp Nov 20, 2024
0a0ae2a
Use make instead of ninja
Davknapp Nov 20, 2024
bab1ed0
change directory befor installing
Davknapp Nov 20, 2024
3545616
set prefix
Davknapp Nov 20, 2024
4b7c143
different approach via updating repositories
Davknapp Nov 20, 2024
20cf8f0
bug-fix
Davknapp Nov 20, 2024
dbe3cd3
remove trailing &&
Davknapp Nov 20, 2024
2e5285c
Change Ubunut Version back to 20.04
Davknapp Nov 20, 2024
1399bec
remove double -y
Davknapp Nov 20, 2024
598c99f
seperate gcc installation
Davknapp Nov 20, 2024
085c2c3
unset library path before installing gcc
Davknapp Nov 20, 2024
5848520
run the prerequisites skript instead
Davknapp Nov 20, 2024
5cbdac1
Remove trailing \
Davknapp Nov 20, 2024
fff4798
update directory-structure
Davknapp Nov 20, 2024
d1c86f4
install libs
Davknapp Nov 20, 2024
85f334b
Print versions of gcc and g++
Davknapp Nov 20, 2024
9301159
check library path
Davknapp Nov 20, 2024
6218f99
check LD_LIBRARY_PATH
Davknapp Nov 20, 2024
a9c1144
LD_LIBRARY_PATH and LIBRARY_PATH are empty
Davknapp Nov 20, 2024
b42c40c
dont change directories after make
Davknapp Nov 20, 2024
5094fa1
install flex
Davknapp Nov 20, 2024
b7a2dd5
use ubunute 22.04
Davknapp Nov 21, 2024
4285162
Remove stray \
Davknapp Nov 21, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions dependencies/ubuntu/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
FROM ubuntu:20.04
FROM ubuntu:22.04
LABEL org.opencontainers.image.authors="Sandro Elsweijer <[email protected]>"
LABEL Description="Ubuntu 20.04 with VTK, NetCDF and OpenCASCADE setup for use with t8code"
LABEL Description="Ubuntu 22.04 with VTK, NetCDF and OpenCASCADE setup for use with t8code"
SHELL ["/bin/bash", "-c"]

ARG vtk_version=9.1.0
ARG vtk_library_version=9.1

ENV DEBIAN_FRONTEND noninteractive
ENV LIBRARY_PATH=/usr/local/lib:$LIBRARY_PATH
ENV LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH
ENV LIBRARY_PATH=/usr/local/lib
ENV LD_LIBRARY_PATH=/usr/local/lib

#######################################################
# Install software requirements and build tools #
Expand All @@ -18,7 +18,7 @@ RUN apt-get update -y && apt-get upgrade -y; \
# Prepare apt-get build-dep (https://askubuntu.com/questions/496549/error-you-must-put-some-source-uris-in-your-sources-list)
cp /etc/apt/sources.list /etc/apt/sources.list~; \
sed -Ei 's/^# deb-src /deb-src /' /etc/apt/sources.list; \
apt-get update; \
apt-get update && apt install build-essential; \
# install compiler cmake and other useful stuff
apt-get install -y sudo \
build-essential \
Expand All @@ -45,6 +45,7 @@ RUN apt-get update -y && apt-get upgrade -y; \
# install NetCDF
libnetcdf-dev


# clone vtk
RUN git clone https://github.com/Kitware/VTK.git; \
cd VTK; \
Expand Down
6 changes: 3 additions & 3 deletions t8code/ubuntu/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM dlramr/t8code-ubuntu:t8-dependencies
LABEL org.opencontainers.image.authors="Sandro Elsweijer <[email protected]>"
LABEL Description="Ubuntu 20.04 with VTK, NetCDF and OpenCASCADE setup and t8code"
LABEL Description="Ubuntu 22.04 with VTK, NetCDF and OpenCASCADE setup and t8code"
SHELL ["/bin/bash", "-c"]

ARG t8code_version=1.0.0
Expand Down Expand Up @@ -30,6 +30,6 @@ cd t8code_build; \
LDFLAGS="-L/usr/lib/ -L/usr/local/lib" \
CPPFLAGS="-isystem/usr/include/opencascade -isystem/usr/include/vtk-${vtk_library_version}"; \
make -j4 V=0; \
make install -j4; \
fi
make install -j4;


Loading