Merge 59ff7f8bef into 604f19a9ea

075baf6e Fix gitstatus build failure with Apple Clang 17 (Xcode 16+)
6bcf109c Compiling on mips64 (#476)

git-subtree-dir: gitstatus
git-subtree-split: 075baf6ecb19f58b09c9562f33c20b842e870961

README.md

@@ -431,6 +431,7 @@ Powerlevel10k.
 - [Arch Linux](#arch-linux)
 - [Alpine Linux](#alpine-linux)
 - [Fig](#fig)
+- [Sheldon](#sheldon)
 
 ### Manual
 
@@ -549,6 +550,21 @@ ln -s /usr/share/zsh/plugins/powerlevel10k ~/.local/share/zsh/plugins/
 Follow the instructions on
 [this page](https://fig.io/plugins/other/powerlevel10k).
 
+### Sheldon
+
+Add the following to the Sheldon config file.
+
+```toml
+[plugins.powerlevel10k]
+github = "romkatv/powerlevel10k"
+```
+
+Or run the following to automatically add it.
+
+```zsh
+sheldon add powerlevel10k --github romkatv/powerlevel10k
+```
+
 ## Configuration
 
 - [For new users](#for-new-users)

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;;