diff --git a/core/org.eclipse.cdt.core.macosx/os/macosx/aarch64/libpty.jnilib b/core/org.eclipse.cdt.core.macosx/os/macosx/aarch64/libpty.jnilib index a8028f753b0..b801728a7ba 100755 Binary files a/core/org.eclipse.cdt.core.macosx/os/macosx/aarch64/libpty.jnilib and b/core/org.eclipse.cdt.core.macosx/os/macosx/aarch64/libpty.jnilib differ diff --git a/core/org.eclipse.cdt.core.macosx/os/macosx/aarch64/libspawner.jnilib b/core/org.eclipse.cdt.core.macosx/os/macosx/aarch64/libspawner.jnilib index 1b2ebe73c12..274d27a42a8 100755 Binary files a/core/org.eclipse.cdt.core.macosx/os/macosx/aarch64/libspawner.jnilib and b/core/org.eclipse.cdt.core.macosx/os/macosx/aarch64/libspawner.jnilib differ diff --git a/docker/cdt-infra-build-macos-sdk/ubuntu-18.04/Dockerfile b/docker/cdt-infra-build-macos-sdk/ubuntu-18.04/Dockerfile index ba51e148133..b1c73419e29 100644 --- a/docker/cdt-infra-build-macos-sdk/ubuntu-18.04/Dockerfile +++ b/docker/cdt-infra-build-macos-sdk/ubuntu-18.04/Dockerfile @@ -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 diff --git a/native/org.eclipse.cdt.native.serial/os/macosx/aarch64/libserial.jnilib b/native/org.eclipse.cdt.native.serial/os/macosx/aarch64/libserial.jnilib index dcebcd9e97d..5775f222931 100755 Binary files a/native/org.eclipse.cdt.native.serial/os/macosx/aarch64/libserial.jnilib and b/native/org.eclipse.cdt.native.serial/os/macosx/aarch64/libserial.jnilib differ