Merge commit '20eb8c64bf2520e20739610acb503c8729867a5e'

gitstatus/build

@@ -88,7 +88,7 @@ if [ -n "$gitstatus_install_tools" ]; then
       fi
     ;;
     freebsd)
-      command pkg install -y cmake gmake binutils gcc git perl5
+      command pkg install -y cmake gmake binutils git perl5 wget
     ;;
     openbsd)
       command pkg_add install cmake gmake gcc git wget
@@ -140,8 +140,15 @@ cflags="$archflag=$gitstatus_cpu -fno-plt -D_FORTIFY_SOURCE=2 -Wformat -Werror=f
 ldflags=
 static_pie=
 
+if [ -z "${CC-}" ]; then
+  case "$gitstatus_kernel" in
+    freebsd) export CC=clang;;
+    *)       export CC=cc;;
+  esac
+fi
+
 printf 'int main() {}\n' >"$workdir"/cc-test.c
-if 2>/dev/null "${CC:-cc}"   \
+if 2>/dev/null "$CC"   \
      -ffile-prefix-map=x=y   \
      -Werror                 \
      -c "$workdir"/cc-test.c \
@@ -150,7 +157,7 @@ if 2>/dev/null "${CC:-cc}"   \
 fi
 
 command rm -f -- "$workdir"/cc-test "$workdir"/cc-test.o
-if 2>/dev/null "${CC:-cc}"                    \
+if 2>/dev/null "$CC"                    \
      -fstack-clash-protection -fcf-protection \
      -Werror                                  \
      -c "$workdir"/cc-test.c                  \
@@ -159,7 +166,7 @@ if 2>/dev/null "${CC:-cc}"                    \
 fi
 
 command rm -f -- "$workdir"/cc-test "$workdir"/cc-test.o
-if 2>/dev/null "${CC:-cc}"                             \
+if 2>/dev/null "$CC"                             \
      -Wl,-O1,--sort-common,--as-needed,-z,relro,-z,now \
      -Werror                                           \
      "$workdir"/cc-test.c                              \
@@ -168,7 +175,7 @@ if 2>/dev/null "${CC:-cc}"                             \
 fi
 
 command rm -f -- "$workdir"/cc-test "$workdir"/cc-test.o
-if 2>/dev/null "${CC:-cc}" \
+if 2>/dev/null "$CC" \
      -fpie -static-pie     \
      -Werror               \
      "$workdir"/cc-test.c  \
@@ -195,6 +202,7 @@ case "$gitstatus_kernel" in
     libgit2_cmake_flags="$libgit2_cmake_flags -DENABLE_REPRODUCIBLE_BUILDS=ON"
   ;;
   freebsd)
+    gitstatus_cxx=clang++
     gitstatus_make=gmake
     gitstatus_ldflags="$gitstatus_ldflags ${static_pie:--static}"
     libgit2_cmake_flags="$libgit2_cmake_flags -DENABLE_REPRODUCIBLE_BUILDS=ON"
@@ -241,7 +249,7 @@ case "$gitstatus_kernel" in
   ;;
 esac
 
-for cmd in cat cmake gcc g++ git ld ln mkdir rm strip tar "$gitstatus_make"; do
+for cmd in cat cmake git ld ln mkdir rm strip tar "$gitstatus_make"; do
   if ! command -v "$cmd" >/dev/null 2>&1; then
     if [ -n "$gitstatus_install_tools" ]; then
       >&2 echo "[internal error] $cmd not found"

gitstatus/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.1"
+gitstatus_version="v1.5.3"
 
 # libgit2 is a build time dependency of gitstatusd. The values of
 # libgit2_version and libgit2_sha256 are read by ./build.

gitstatus/install.info

@@ -1,4 +1,4 @@
-# 1
+# 2
 #
 # This file is used by ./install and indirectly by shell bindings.
 #
@@ -12,7 +12,7 @@ uname_s_glob="cygwin_nt-10.0"; uname_m_glob="i686";    file="gitstatusd-${uname_
 uname_s_glob="cygwin_nt-10.0"; uname_m_glob="x86_64";  file="gitstatusd-${uname_s}-${uname_m}";     version="v1.5.1"; sha256="c84cade0d6b86e04c27a6055f45851f6b46d6b88ba58772f7ca8ef4d295c800f";
 uname_s_glob="darwin";         uname_m_glob="arm64";   file="gitstatusd-${uname_s}-${uname_m}";     version="v1.5.1"; sha256="ad973948cca4bdcf83b7fcdda70c489a404488ea7304712721f1100b73ec7cbe";
 uname_s_glob="darwin";         uname_m_glob="x86_64";  file="gitstatusd-${uname_s}-${uname_m}";     version="v1.5.1"; sha256="b13455d56cf7b6f07efb7da088057bbc1212847c88b59493918d6f9c0c157160";
-uname_s_glob="freebsd";        uname_m_glob="amd64";   file="gitstatusd-${uname_s}-${uname_m}";     version="v1.5.1"; sha256="b738c0967ba7a851bd758cd9fd836cddeec9fb4246afddc66ab4fed40c03e426";
+uname_s_glob="freebsd";        uname_m_glob="amd64";   file="gitstatusd-${uname_s}-${uname_m}";     version="v1.5.3"; sha256="73b5622ec9737e93f3fafe117b47ce8de33037be3e2bff283f36668f5852668a";
 uname_s_glob="linux";          uname_m_glob="aarch64"; file="gitstatusd-${uname_s}-${uname_m}";     version="v1.5.1"; sha256="89b87181b2005527a558cdbc32b12b0f15a1a12bb69865ec216ca5a0266a6c4f";
 uname_s_glob="linux";          uname_m_glob="armv6l";  file="gitstatusd-${uname_s}-${uname_m}";     version="v1.5.1"; sha256="4bf5a0d0a082f544a48536ad3675930d5d2cc6a8cf906710045e0788f51192b3";
 uname_s_glob="linux";          uname_m_glob="armv7l";  file="gitstatusd-${uname_s}-${uname_m}";     version="v1.5.1"; sha256="2b9deb29f86c8209114b71b94fc2e1ed936a1658808a1bee46f4a82fd6a1f8cc";