From 140a6ade4e9d7431df697de4dfff04b353e219e2 Mon Sep 17 00:00:00 2001 From: Roman Perepelitsa Date: Thu, 3 Oct 2024 11:16:46 +0200 Subject: [PATCH] Squashed 'gitstatus/' changes from 62177e89..44504a24 44504a24 make: remove -Wall 8795883c Specify cmake generator in build file (#441) 3e08476b docs: the project is on life support 12e6a689 Add support to build e2k arch. (#432) a952c3f6 bump version to v1.5.5 git-subtree-dir: gitstatus git-subtree-split: 44504a24b1b999a4f56ff74c75b8215bdcadee1f --- Makefile | 2 +- README.md | 4 ++++ build | 13 ++++++++++++- build.info | 2 +- 4 files changed, 18 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index adb20e9d..4a695acb 100644 --- a/Makefile +++ b/Makefile @@ -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 # 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 LDLIBS += -lgit2 # -lprofiler -lunwind diff --git a/README.md b/README.md index a6631f63..609d5f82 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,9 @@ # 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 case is to enable fast git prompt in interactive shells. diff --git a/build b/build index e116abb2..ea96a25a 100755 --- a/build +++ b/build @@ -153,7 +153,16 @@ case "$gitstatus_cpu" in ;; 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= static_pie= @@ -384,6 +393,7 @@ CFLAGS="$libgit2_cflags" command cmake \ -DUSE_GSSAPI=OFF \ -DUSE_NTLMCLIENT=OFF \ -DBUILD_SHARED_LIBS=OFF \ + -G "Unix Makefiles" \ $libgit2_cmake_flags \ .. command make -j "$cpus" VERBOSE=1 @@ -545,6 +555,7 @@ if [ -z "$gitstatus_cpu" ]; then x86_64|amd64) gitstatus_cpu=x86-64;; x86) gitstatus_cpu=i586;; s390x) gitstatus_cpu=z900;; + e2k) gitstatus_cpu=native;; i386|i586|i686) gitstatus_cpu="$gitstatus_arch";; *) >&2 echo '[error] unable to infer target CPU architecture' diff --git a/build.info b/build.info index 9a4967e8..9bc9411d 100644 --- a/build.info +++ b/build.info @@ -3,7 +3,7 @@ # # This value is also read by shell bindings (indirectly, through # ./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_version and libgit2_sha256 are read by ./build.