From 57025065836a6c0434ed746b5f71fed48555501b Mon Sep 17 00:00:00 2001
From: Giulio Eulisse <10544+ktf@users.noreply.github.com>
Date: Sun, 5 Oct 2025 23:41:08 +0200
Subject: [PATCH 1/2] Get Tahoe to work

---
 onnxruntime.sh | 15 ++++++++++++++-
 protobuf.sh    |  6 +++---
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/onnxruntime.sh b/onnxruntime.sh
index bce337f397..3cde0af202 100644
--- a/onnxruntime.sh
+++ b/onnxruntime.sh
@@ -1,6 +1,6 @@
 package: ONNXRuntime
 version: "%(tag_basename)s"
-tag: v1.22.0
+tag: v1.22.2
 source: https://github.com/microsoft/onnxruntime
 requires:
   - protobuf
@@ -25,6 +25,14 @@ prepend_path:
 ---
 #!/bin/bash -e
 
+case $ARCHITECTURE in
+  osx*) 
+    export abseil_cpp_DIR=${ABSEIL_ROOT:-$(brew --prefix abseil)}
+    ABSEIL_ROOT=${ABSEIL_ROOT:-$(brew --prefix abseil)}
+    export CMAKE_PATH_PREFIX=${ABSEIL_ROOT}:$CMAKE_PATH_PREFIX
+    ;;
+esac
+
 if [[ -f $GPU_SYSTEM_ROOT/etc/gpu-features-available.sh ]]; then
   source $GPU_SYSTEM_ROOT/etc/gpu-features-available.sh
 fi
@@ -115,6 +123,11 @@ cmake "$SOURCEDIR/cmake"
       -Donnxruntime_USE_FULL_PROTOBUF=ON                                                                    \
       -Donnxruntime_ENABLE_PYTHON=OFF                                                                       \
       -Donnxruntime_MINIMAL_BUILD=OFF                                                                       \
+      -Donnxruntime_DISABLE_ABSEIL=ON                                                                       \
+      --debug-find-pkg=absl                                                                               \
+      ${ABSEIL_ROOT:+-DFETCHCONTENT_SOURCE_DIR_ABSEIL_CPP=${ABSEIL_ROOT}}                                   \
+      ${ABSEIL_ROOT:+-Dabseil_cpp_DIR=$ABSEIL_ROOT}                                                         \
+      ${ABSEIL_ROOT:+-Dabsl_DIR=$ABSEIL_ROOT}                                                               \
       ${PROTOBUF_ROOT:+-DProtobuf_LIBRARY=$PROTOBUF_ROOT/lib/libprotobuf.a}                                 \
       ${PROTOBUF_ROOT:+-DProtobuf_LITE_LIBRARY=$PROTOBUF_ROOT/lib/libprotobuf-lite.a}                       \
       ${PROTOBUF_ROOT:+-DProtobuf_PROTOC_LIBRARY=$PROTOBUF_ROOT/lib/libprotoc.a}                            \
diff --git a/protobuf.sh b/protobuf.sh
index 2747943e51..5e259d70fe 100644
--- a/protobuf.sh
+++ b/protobuf.sh
@@ -1,6 +1,6 @@
 package: protobuf
-version: v29.3
-tag: v29.3
+version: v32.1
+tag: v32.1
 source: https://github.com/protocolbuffers/protobuf
 build_requires:
   - CMake
@@ -25,7 +25,7 @@ cmake -S "$ALIBUILD_CMAKE_SOURCE_DIR"                  \
     -Dprotobuf_MODULE_COMPATIBLE=YES      \
     -Dprotobuf_BUILD_SHARED_LIBS=OFF      \
     -Dprotobuf_ABSL_PROVIDER=package      \
-    -DABSL_ROOT_DIR=$ABSEIL_ROOT          \
+    ${ABSEIL_ROOT:+-Dabsl_DIR=$ABSEIL_ROOT} \
     -DCMAKE_INSTALL_LIBDIR=lib
 
 cmake --build . -- ${JOBS:+-j$JOBS} install

From 2d1f4d573649319143454ff6b58f4b4cc2fd1bfe Mon Sep 17 00:00:00 2001
From: Giulio Eulisse <10544+ktf@users.noreply.github.com>
Date: Sun, 5 Oct 2025 23:41:08 +0200
Subject: [PATCH 2/2] Compile librdkafka on macOS Tahoe

./configure is broken due to depending on an obsolete ctags flag.
---
 librdkafka.sh | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/librdkafka.sh b/librdkafka.sh
index 5c1818789a..959233f2c3 100644
--- a/librdkafka.sh
+++ b/librdkafka.sh
@@ -3,19 +3,24 @@ version: "%(tag_basename)s"
 tag: v2.3.0
 requires:
   - "GCC-Toolchain:(?!osx)"
+  - lz4
+  - zlib
 build_requires:
   - alibuild-recipe-tools
   - CMake
+  - ninja
 source: https://github.com/edenhill/librdkafka
 ---
 
-rsync -a --delete --exclude "**/.git" "$SOURCEDIR/" .
+cmake ${SOURCEDIR}                                                                                  \
+      -DWITH_SSL=OFF                                                                                \
+      -DWITH_CURL=OFF                                                                               \
+      -DRDKAFKA_BUILD_EXAMPLES=OFF                                                                  \
+      -DRDKAFKA_BUILD_TESTS=OFF                                                                     \
+      -DCMAKE_INSTALL_PREFIX="$INSTALLROOT"                                                         \
+      -G Ninja                                                                                      \
 
-# cmake in rdfkafka links against ssl even when disabled, so we need to use configure, which is also recommended by librdkafka devs.
-./configure --prefix="$INSTALLROOT" --disable-ssl --disable-gssapi --disable-curl
-
-make ${JOBS+-j $JOBS}
-make install
+cmake --build . -- ${JOBS:+-j $JOBS} install
 
 #ModuleFile
 mkdir -p etc/modulefiles