From b433dfad029ed2fe4556c59d62d45708d55a8328 Mon Sep 17 00:00:00 2001
From: Jonah Graham <jonah@kichwacoders.com>
Date: Wed, 1 May 2024 12:32:58 -0400
Subject: [PATCH] Update docker image of osxcross to latest requirements.

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?
---
 .../os/macosx/aarch64/libpty.jnilib           | Bin 51242 -> 51242 bytes
 .../os/macosx/aarch64/libspawner.jnilib       | Bin 53454 -> 53454 bytes
 .../ubuntu-18.04/Dockerfile                   |  14 +++++++++++++-
 .../os/macosx/aarch64/libserial.jnilib        | Bin 51101 -> 51101 bytes
 4 files changed, 13 insertions(+), 1 deletion(-)

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 a8028f753b04eefe9f8e901aba70569adb59467b..b801728a7ba0351ce94f36141f0e61cd84a3171e 100755
GIT binary patch
delta 99
zcmZ2AfqB&g<_!l}1eUI;(pG(7{dAc`){U2b4=zr=z#_+ZeDiyj=7Sav3^0(BnN(0x
zsh5?P31l%SKK>(}^1kC3lc*c><oo}QZ=Ba}I{nz8i@!x@2W}2ZPusleSOX&fHi;{<

delta 93
zcmV-j0HXh@kOQia1F*mZ5SV93m}ep~gt6!`*g;J1%9GFp9syyq?*xOvlYj*ZE^KLH
zaCCVtYHn$4X<`7sJ|G%$6|BKUtItF#v0gPxJ6)gk$X5b4pHhKn%U1WZs>Xl;N7yJ~

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 1b2ebe73c1205c62842a3aca6a1b2b0d14eda409..274d27a42a8e9aef586a340396a254990701f6b4 100755
GIT binary patch
delta 103
zcmX@Nkonv~<_!s~0x!Aue6wjb7Te~}mg2bX;pxc*ta6OUH}|tPpR{pcfPtLMq~e0a
z^1Rd{y{x=UAdg}48{Oy?4-&(5YL~CNy@;pm!G&qM$M}CgQU3Vho>+4I{>^^p8yEpj
CsVnUO

delta 97
zcmV-n0G|KOp##pL1F&EP5C%@_KPm4$AeU=O6KNOfRg-W99syyqj|GFtlOP5PGHhvL
zb8umIZe?;VYHn$4X<`7UeTul`x)W${lA(7_%k^-(ml*gWwDgs(frAHim!cH2PS1b=
DY||;L

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 dcebcd9e97d67a88fc5936478b1c9082b2ce786f..5775f2229314579dea4277b21fa1f3dafbffd612 100755
GIT binary patch
delta 102
zcmbQ+&pfxEdBXx00h_(t26K2Ule%wQ)wq6OdjI4NEOLy;H=kz_K4|U000TLhNyVu}
znTa`iS$Ua24#Tkmdw#PAX<|oP9*3Oq=GVKneBlee`>cx<^uEo%V!X3!v+S`3MgYI4
BD1QI|

delta 96
zcmV-m0H6Pzj{}{L1F)b35SyL><6jsz2cj>Bkqu@J@RP6v9syyq&jb^}lVAl3F>GmK
zb7gXAVQemHZfR_3VgN-uDF3XIwU3Frop1+vE)|{V<b@QYs%`^k_IKO**FUoz#()7F
CNGNjv