Skip to content

Docker updates to CMake 3.16#80

Merged
Frenzie merged 15 commits into
koreader:masterfrom
Frenzie:18.04-updates
Apr 2, 2023
Merged

Docker updates to CMake 3.16#80
Frenzie merged 15 commits into
koreader:masterfrom
Frenzie:18.04-updates

Conversation

@Frenzie

@Frenzie Frenzie commented Jun 2, 2022

Copy link
Copy Markdown
Member

Using 18.04 for all the cross stuff, cf. #79.


This change is Reviewable

@@ -1,4 +1,4 @@
FROM koreader/kobase-python:0.2.2
FROM koreader/kobase-18.04:0.3.0

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Android isn't participating yet for some reason. ;_;

The rest is good.

Frenzie added a commit to koreader/koreader-base that referenced this pull request Jun 3, 2022
Frenzie added a commit to koreader/koreader-base that referenced this pull request Apr 2, 2023
&& update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-12 380 \
&& update-alternatives --install /usr/bin/clang-cpp clang-cpp /usr/bin/clang-cpp-12 380 \
&& update-alternatives --install /usr/bin/gcc gcc /usr/bin/clang-12 380 \
&& apt-get install -y --no-install-recommends libtool-bin clang-16 \

@Frenzie Frenzie Apr 2, 2023

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not really sure why only clang but either way, also see https://github.com/zeromq/libzmq/issues/1385

In principle it should already be there so this is rather strange:

# libtool-bin is due to a libzmq issue, see https://github.com/zeromq/libzmq/pull/1497
# can be removed if libzmq is bumped
MISC_TOOLS=(git subversion zip unzip vim wget p7zip-full bash-completion
sudo libtool libtool-bin)

Frenzie added a commit to koreader/koreader-base that referenced this pull request Apr 2, 2023
@Frenzie Frenzie marked this pull request as ready for review April 2, 2023 16:33
@Frenzie Frenzie merged commit 0318ce0 into koreader:master Apr 2, 2023
@Frenzie Frenzie deleted the 18.04-updates branch April 2, 2023 16:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant