Compare commits

...

3 Commits

Author SHA1 Message Date
Shaheen Gandhi e5e36687ab
Merge 44ade697bf into 604f19a9ea 2026-03-15 04:46:37 +01: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
Shaheen Gandhi 44ade697bf ssh: optimize detection 2024-10-15 22:45:19 -07:00
2 changed files with 5 additions and 3 deletions

View File

@ -272,9 +272,9 @@ case "$gitstatus_kernel" in
gitstatus_cxxflags="$gitstatus_cxxflags -I"$brew_prefix"/opt/libiconv/include" gitstatus_cxxflags="$gitstatus_cxxflags -I"$brew_prefix"/opt/libiconv/include"
fi fi
libgit2_cmake_flags="$libgit2_cmake_flags -DUSE_ICONV=ON" 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" 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*) msys*|mingw*)
gitstatus_ldflags="$gitstatus_ldflags ${static_pie:--static}" gitstatus_ldflags="$gitstatus_ldflags ${static_pie:--static}"
@ -551,6 +551,7 @@ if [ -z "$gitstatus_cpu" ]; then
arm64|aarch64) gitstatus_cpu=armv8-a;; arm64|aarch64) gitstatus_cpu=armv8-a;;
ppc64|ppc64le) gitstatus_cpu=powerpc64le;; ppc64|ppc64le) gitstatus_cpu=powerpc64le;;
riscv64) gitstatus_cpu=rv64imafdc;; riscv64) gitstatus_cpu=rv64imafdc;;
mips64) gitstatus_cpu=mips64;;
loongarch64) gitstatus_cpu=loongarch64;; loongarch64) gitstatus_cpu=loongarch64;;
x86_64|amd64) gitstatus_cpu=x86-64;; x86_64|amd64) gitstatus_cpu=x86-64;;
x86) gitstatus_cpu=i586;; x86) gitstatus_cpu=i586;;

View File

@ -8496,7 +8496,8 @@ _p9k_init_ssh() {
# When changing user on a remote system, the $SSH_CONNECTION environment variable can be lost. # When changing user on a remote system, the $SSH_CONNECTION environment variable can be lost.
# Attempt detection via `who`. # Attempt detection via `who`.
(( $+commands[who] )) || return [[ -z "$(command -v who)" ]] && return
#(( $+commands[who] )) || return
local ipv6='(([0-9a-fA-F]+:)|:){2,}[0-9a-fA-F]+' # Simplified, only checks partial pattern. local ipv6='(([0-9a-fA-F]+:)|:){2,}[0-9a-fA-F]+' # Simplified, only checks partial pattern.
local ipv4='([0-9]{1,3}\.){3}[0-9]+' # Simplified, allows invalid ranges. local ipv4='([0-9]{1,3}\.){3}[0-9]+' # Simplified, allows invalid ranges.