Customization/powerlevel10k
1
0
Fork 0
mirror of https://github.com/romkatv/powerlevel10k.git synced 2024-11-22 12:20:07 +00:00
Code Releases Activity

Squashed 'gitstatus/' changes from f9acc15a..cb363c77

Browse source 
cb363c77 build: use zsh if possible when langued with bash < 4.0 (#188)
efb0fd1b make mbuild work with darwin-aarch64
c9e6e608 do not hardcode path to homebrew, retrieve it with `brew --prefix`
df4eba94 work around bugs in ancient versions of bash (#188)

git-subtree-dir: gitstatus
git-subtree-split: cb363c778a37575b0d5371d7e355d80ec7ae5498
This commit is contained in:
Roman Perepelitsa 2020-11-17 10:02:15 +01:00
parent b7167a64c6
commit 790f4719ab
2 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
build
View file

@ -11,6 +11,12 @@ fi
export LC_ALL=C export LC_ALL=C
if [ -z "${ZSH_VERSION-}" ] && command -v zsh >/dev/null 2>&1; then
case "${BASH_VERSION-}" in
[0-3].*) exec zsh "$0" "$@";;
esac
fi
usage="$(command cat <<\END usage="$(command cat <<\END
Usage: build [-m ARCH] [-c CPU] [-d CMD] [-i IMAGE] [-s] [-w] Usage: build [-m ARCH] [-c CPU] [-d CMD] [-i IMAGE] [-s] [-w]
@ -29,7 +35,7 @@ Options:
succeed; on some operating systems this option is not succeed; on some operating systems this option is not
supported; on others it can have partial effect supported; on others it can have partial effect
-w automatically download tarballs for dependencies if they -w automatically download tarballs for dependencies if they
don't already exist in ./deps; dependencies are described do not already exist in ./deps; dependencies are described
in ./build.info in ./build.info
END END
)" )"
@ -159,10 +165,11 @@ case "$gitstatus_kernel" in
;; ;;
darwin) darwin)
command mkdir -- "$workdir"/lib command mkdir -- "$workdir"/lib
command ln -s -- /usr/local/opt/libiconv/lib/libiconv.a "$workdir"/lib brew_prefix="$(command brew --prefix)"
command ln -s -- "$brew_prefix"/opt/libiconv/lib/libiconv.a "$workdir"/lib
libgit2_cmake_flags="$libgit2_cmake_flags -DUSE_ICONV=ON" libgit2_cmake_flags="$libgit2_cmake_flags -DUSE_ICONV=ON"
libgit2_cflags="$libgit2_cflags -I/usr/local/opt/libiconv/include" libgit2_cflags="$libgit2_cflags -I"$brew_prefix"/opt/libiconv/include"
gitstatus_cxxflags="$gitstatus_cxxflags -I/usr/local/opt/libiconv/include" gitstatus_cxxflags="$gitstatus_cxxflags -I"$brew_prefix"/opt/libiconv/include"
gitstatus_ldlibs="$gitstatus_ldlibs -liconv" gitstatus_ldlibs="$gitstatus_ldlibs -liconv"
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"

1
mbuild
View file

@ -183,6 +183,7 @@ function build-unix() {
case $2 in case $2 in
linux-ppc64le) ;; linux-ppc64le) ;;
linux-*) flags+=(-d docker);; linux-*) flags+=(-d docker);;
darwin-aarch64) intro='PATH="/opt/homebrew/bin:$PATH"';;
darwin-*) intro='PATH="/usr/local/bin:$PATH"';; darwin-*) intro='PATH="/usr/local/bin:$PATH"';;
esac esac
ssh $1 -- /bin/sh -uex <<<" ssh $1 -- /bin/sh -uex <<<"