Improve externals detection in ONNXRuntime

Author: ktf

onnxruntime.sh

@@ -32,6 +32,18 @@ sed -i.bak "s/eigen/Eigen3/g" cmake/external/eigen.cmake
 python3 -c 'import sys; print(sys.executable)'
 sed -i.bak "s/CMAKE_CXX_STANDARD 17/CMAKE_CXX_STANDARD 20/;s/-Wno-interference-size/-w/" cmake/CMakeLists.txt
 
+case $ARCHITECTURE in
+  osx*) 
+    export abseil_cpp_DIR=${ABSEIL_ROOT:-$(brew --prefix abseil)}
+    ABSEIL_ROOT=${ABSEIL_ROOT:-$(brew --prefix abseil)}
+    NLOHMANN_JSON_ROOT=${NLOHMANN_JSON_ROOT:-$(brew --prefix nlohmann-json)}
+    RE2_ROOT=${RE2_ROOT:-$(brew --prefix re2)}
+    export re2_DIR=${RE2_ROOT}
+    export absl_DIR=${ABSEIL_ROOT}
+    export CMAKE_PATH_PREFIX=${NLOHMANN_JSON_ROOT}:${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
@@ -121,6 +133,11 @@ cmake "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}                            \

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
@@ -26,7 +26,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