Merge d8fbc75bab into 604f19a9ea

Squashed 'gitstatus/' changes from 44504a24..075baf6e
075baf6e Fix gitstatus build failure with Apple Clang 17 (Xcode 16+) 6bcf109c Compiling on mips64 (#476) git-subtree-dir: gitstatus git-subtree-split: 075baf6ecb19f58b09c9562f33c20b842e870961
2026-03-16 20:34:54 +02:00 · 2026-03-14 07:07:11 +01:00
1 changed files with 3 additions and 2 deletions
--- a/gitstatus/build
+++ b/gitstatus/build
@ -272,9 +272,9 @@ case "$gitstatus_kernel" in
      gitstatus_cxxflags="$gitstatus_cxxflags -I"$brew_prefix"/opt/libiconv/include"
    fi
    libgit2_cmake_flags="$libgit2_cmake_flags -DUSE_ICONV=ON"
-    gitstatus_ldlibs="$gitstatus_ldlibs -liconv"
+    gitstatus_ldlibs="$gitstatus_ldlibs -liconv -lz"
    gitstatus_ldflags="$gitstatus_ldflags -L${workdir}/lib"
-    libgit2_cmake_flags="$libgit2_cmake_flags -DENABLE_REPRODUCIBLE_BUILDS=OFF"
+    libgit2_cmake_flags="$libgit2_cmake_flags -DENABLE_REPRODUCIBLE_BUILDS=OFF -DUSE_BUNDLED_ZLIB=OFF"
  ;;
  msys*|mingw*)
    gitstatus_ldflags="$gitstatus_ldflags ${static_pie:--static}"
@ -551,6 +551,7 @@ if [ -z "$gitstatus_cpu" ]; then
    arm64|aarch64)  gitstatus_cpu=armv8-a;;
    ppc64|ppc64le)  gitstatus_cpu=powerpc64le;;
    riscv64)        gitstatus_cpu=rv64imafdc;;
+    mips64)         gitstatus_cpu=mips64;;
    loongarch64)    gitstatus_cpu=loongarch64;;
    x86_64|amd64)   gitstatus_cpu=x86-64;;
    x86)            gitstatus_cpu=i586;;
Author	SHA1	Message	Date
Ahmed Hosam	8b6c3cb40c	Merge `d8fbc75bab` into `604f19a9ea`	2026-03-16 20:34:54 +02:00
Roman Perepelitsa	604f19a9ea	Squashed 'gitstatus/' changes from 44504a24..075baf6e 075baf6e Fix gitstatus build failure with Apple Clang 17 (Xcode 16+) 6bcf109c Compiling on mips64 (#476) git-subtree-dir: gitstatus git-subtree-split: 075baf6ecb19f58b09c9562f33c20b842e870961	2026-03-14 07:07:11 +01:00