mirror of
https://github.com/romkatv/powerlevel10k.git
synced 2024-12-07 11:13:20 +02:00
Merge commit '140a6ade4e9d7431df697de4dfff04b353e219e2'
This commit is contained in:
commit
c64a133616
@ -10,7 +10,7 @@ VERSION ?= $(shell . ./build.info && printf "%s" "$$gitstatus_version")
|
|||||||
#
|
#
|
||||||
# Sized delete is implemented as __ZdlPvm in /usr/lib/libc++.1.dylib but this symbol is
|
# Sized delete is implemented as __ZdlPvm in /usr/lib/libc++.1.dylib but this symbol is
|
||||||
# missing in macOS prior to 10.13.
|
# missing in macOS prior to 10.13.
|
||||||
CXXFLAGS += -std=c++14 -funsigned-char -O3 -DNDEBUG -DGITSTATUS_VERSION=$(VERSION) -Wall # -g -fsanitize=thread
|
CXXFLAGS += -std=c++14 -funsigned-char -O3 -DNDEBUG -DGITSTATUS_VERSION=$(VERSION) # -Wall -g -fsanitize=thread
|
||||||
LDFLAGS += -pthread # -fsanitize=thread
|
LDFLAGS += -pthread # -fsanitize=thread
|
||||||
LDLIBS += -lgit2 # -lprofiler -lunwind
|
LDLIBS += -lgit2 # -lprofiler -lunwind
|
||||||
|
|
||||||
|
@ -1,5 +1,9 @@
|
|||||||
# gitstatus
|
# gitstatus
|
||||||
|
|
||||||
|
- **THE PROJECT HAS VERY LIMITED SUPPORT**
|
||||||
|
- **NO NEW FEATURES ARE IN THE WORKS**
|
||||||
|
- **MOST BUGS WILL GO UNFIXED**
|
||||||
|
|
||||||
**gitstatus** is a 10x faster alternative to `git status` and `git describe`. Its primary use
|
**gitstatus** is a 10x faster alternative to `git status` and `git describe`. Its primary use
|
||||||
case is to enable fast git prompt in interactive shells.
|
case is to enable fast git prompt in interactive shells.
|
||||||
|
|
||||||
|
@ -153,7 +153,16 @@ case "$gitstatus_cpu" in
|
|||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
cflags="$archflag=$gitstatus_cpu -fno-plt -D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security -fpie"
|
case "$gitstatus_arch" in
|
||||||
|
e2k)
|
||||||
|
nopltflag=""
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
nopltflag="-fno-plt"
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
|
||||||
|
cflags="$archflag=$gitstatus_cpu $nopltflag -D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security -fpie"
|
||||||
ldflags=
|
ldflags=
|
||||||
static_pie=
|
static_pie=
|
||||||
|
|
||||||
@ -384,6 +393,7 @@ CFLAGS="$libgit2_cflags" command cmake \
|
|||||||
-DUSE_GSSAPI=OFF \
|
-DUSE_GSSAPI=OFF \
|
||||||
-DUSE_NTLMCLIENT=OFF \
|
-DUSE_NTLMCLIENT=OFF \
|
||||||
-DBUILD_SHARED_LIBS=OFF \
|
-DBUILD_SHARED_LIBS=OFF \
|
||||||
|
-G "Unix Makefiles" \
|
||||||
$libgit2_cmake_flags \
|
$libgit2_cmake_flags \
|
||||||
..
|
..
|
||||||
command make -j "$cpus" VERBOSE=1
|
command make -j "$cpus" VERBOSE=1
|
||||||
@ -545,6 +555,7 @@ if [ -z "$gitstatus_cpu" ]; then
|
|||||||
x86_64|amd64) gitstatus_cpu=x86-64;;
|
x86_64|amd64) gitstatus_cpu=x86-64;;
|
||||||
x86) gitstatus_cpu=i586;;
|
x86) gitstatus_cpu=i586;;
|
||||||
s390x) gitstatus_cpu=z900;;
|
s390x) gitstatus_cpu=z900;;
|
||||||
|
e2k) gitstatus_cpu=native;;
|
||||||
i386|i586|i686) gitstatus_cpu="$gitstatus_arch";;
|
i386|i586|i686) gitstatus_cpu="$gitstatus_arch";;
|
||||||
*)
|
*)
|
||||||
>&2 echo '[error] unable to infer target CPU architecture'
|
>&2 echo '[error] unable to infer target CPU architecture'
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
#
|
#
|
||||||
# This value is also read by shell bindings (indirectly, through
|
# This value is also read by shell bindings (indirectly, through
|
||||||
# ./install) when using GITSTATUS_DAEMON or usrbin/gitstatusd.
|
# ./install) when using GITSTATUS_DAEMON or usrbin/gitstatusd.
|
||||||
gitstatus_version="v1.5.4"
|
gitstatus_version="v1.5.5"
|
||||||
|
|
||||||
# libgit2 is a build time dependency of gitstatusd. The values of
|
# libgit2 is a build time dependency of gitstatusd. The values of
|
||||||
# libgit2_version and libgit2_sha256 are read by ./build.
|
# libgit2_version and libgit2_sha256 are read by ./build.
|
||||||
|
Loading…
Reference in New Issue
Block a user