DanS
b561406c23
The --mac-release path (full-node and --lite-backend) had never run on a real Mac and broke on several Linux-only assumptions: - build.sh version parser used GNU sed \+ (BSD sed reads it literally), so it aborted before compiling — switched to POSIX [[:space:]][[:space:]]*. - build.sh libsodium universal check used GNU grep \| — switched to grep -E. - libwebp's cpu.cmake applies -mno-sse2 to its reference DSP files; under a universal build (-arch arm64;x86_64) that lands on the x86_64 slice, where it disables _Float16 and breaks the SDK 26 <math.h>. Added an idempotent FetchContent PATCH_COMMAND (cmake/patch-libwebp-simd.cmake) to neutralize it. - The SDXL lite backend static lib needs Security + CoreFoundation frameworks on macOS; added them to the imported dragonx_lite_backend target for APPLE. - Added a DRAGONX_MAC_ARCHS override plus auto-detect: with --lite-backend the app is built for the arch(es) the backend .a actually provides (its pinned ring 0.16.11 is x86_64-only), instead of failing to link a universal app. - build-lite-backend-artifact.sh uses bash 4+ (mapfile); added a re-exec guard for macOS's stock bash 3.2 and added bash to setup.sh's macOS core deps. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
32 lines
1.6 KiB
CMake
32 lines
1.6 KiB
CMake
# patch-libwebp-simd.cmake — portable, idempotent FetchContent patch for libwebp.
|
|
#
|
|
# libwebp's cmake/cpu.cmake compiles its scalar *reference* DSP files with the
|
|
# SSE-disable flags "-mno-sse4.1;-mno-sse2" whenever it can't positively detect
|
|
# SSE support. Under a macOS *universal* build (-arch arm64;x86_64) the per-arch
|
|
# SSE flag probe fails (a flag valid for x86_64 is invalid for arm64), so those
|
|
# disable flags get applied to the x86_64 slice. clang gates the _Float16 type on
|
|
# SSE2 for x86_64, and the macOS 15+/26 SDK's <math.h> declares _Float16 math
|
|
# functions unconditionally — so any TU including <math.h> fails to compile with
|
|
# "_Float16 is not supported on this target".
|
|
#
|
|
# SSE2 is part of the x86_64 baseline ABI, so disabling it on the reference files
|
|
# is unnecessary on every platform we target. Blanking the SSE entries (indices
|
|
# must stay aligned with WEBP_SIMD_FLAGS) fixes the universal build and is a no-op
|
|
# for single-arch Linux/Windows/x86_64 builds. Idempotent: re-running is a no-op.
|
|
if(NOT DEFINED CPU_CMAKE OR NOT EXISTS "${CPU_CMAKE}")
|
|
message(FATAL_ERROR "patch-libwebp-simd: cpu.cmake not found at '${CPU_CMAKE}'")
|
|
endif()
|
|
|
|
file(READ "${CPU_CMAKE}" _contents)
|
|
string(REPLACE
|
|
"set(SIMD_DISABLE_FLAGS \"-mno-sse4.1;-mno-sse2;;-mno-dspr2;;-mno-msa\")"
|
|
"set(SIMD_DISABLE_FLAGS \";;;-mno-dspr2;;-mno-msa\")"
|
|
_patched "${_contents}")
|
|
|
|
if(_patched STREQUAL _contents)
|
|
message(STATUS "patch-libwebp-simd: no change (already patched or pattern absent)")
|
|
else()
|
|
file(WRITE "${CPU_CMAKE}" "${_patched}")
|
|
message(STATUS "patch-libwebp-simd: neutralized x86 SSE-disable flags in cpu.cmake")
|
|
endif()
|