Skip to content

Commit

Permalink
Update docker image of osxcross to latest requirements.
Browse files Browse the repository at this point in the history
Building osxcross is somewhat problematic because the versions
are not fixed and reproducibility of making this docker file
can be problematic. For example new versions of cmake, etc
make be needed. TODO Is there a way to fix the version of
osxcross so that we can rebuild reliably?
  • Loading branch information
jonahgraham committed May 1, 2024
1 parent f0ae450 commit b433dfa
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 1 deletion.
Binary file modified core/org.eclipse.cdt.core.macosx/os/macosx/aarch64/libpty.jnilib
Binary file not shown.
Binary file not shown.
14 changes: 13 additions & 1 deletion docker/cdt-infra-build-macos-sdk/ubuntu-18.04/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,23 @@ FROM ubuntu:18.04

RUN apt-get update
RUN apt-get install -y clang make build-essential
RUN apt-get install -y libssl-dev lzma-dev liblzma-dev libxml2-dev git cmake patch python cpio bzip2 xz-utils libbz2-dev
RUN apt-get install -y libssl-dev lzma-dev liblzma-dev libxml2-dev git patch python cpio bzip2 xz-utils libbz2-dev

# cmake in Ubuntu is too old to build osxcross, therefore
# use this version
RUN apt-get install -y curl
RUN curl -fsSL https://github.com/Kitware/CMake/releases/download/v3.29.2/cmake-3.29.2-linux-x86_64.tar.gz | tar xzf - -C /usr/share
ENV PATH="/usr/share/cmake-3.29.2-linux-x86_64/bin:${PATH}"


# Xcode_13.1.xip needs to be downloaded from
# https://developer.apple.com/download/all/?q=xcode - specically:
ARG Xcodexip=Xcode_13.1.xip
### Building osxcross is somewhat problematic because the versions
### are not fixed and reproducibility of making this docker file
### can be problematic. For example new versions of cmake, etc
### make be needed. TODO Is there a way to fix the version of
### osxcross so that we can rebuild reliably?
WORKDIR /opt
COPY ${Xcodexip} /opt/${Xcodexip}
RUN git clone https://github.com/tpoechtrager/osxcross.git
Expand Down
Binary file not shown.

0 comments on commit b433dfa

Please sign in to comment.