From ba83466e1da75d9260ebbb145215d9c46d6eadf6 Mon Sep 17 00:00:00 2001 From: Roman Perepelitsa Date: Sun, 30 May 2021 10:35:40 +0200 Subject: Squashed 'gitstatus/' changes from 6d00edd0..113f1f69 113f1f69 release gitstatusd-linux-x86_64 v1.5.0 e193be52 expose HEAD's commit message 815301f1 do not redefine `exec` and `builtin` in bash bindings (#235) 97c2aa17 Make `--version-glob` to receive an argument (#216) 95e549fd Support building on OpenBSD (#208) b054ddf2 make homebrew instructions work on systems other than darwin-x86_64 (#205) 98f99ade fix brew formula check git-subtree-dir: gitstatus git-subtree-split: 113f1f698667d12906d97e3818aec5d760dc6e3d --- build | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'build') diff --git a/build b/build index ad1d1484..667def9f 100755 --- a/build +++ b/build @@ -90,6 +90,9 @@ if [ -n "$gitstatus_install_tools" ]; then freebsd) command pkg install -y cmake gmake binutils gcc git perl5 ;; + openbsd) + command pkg_add install cmake gmake gcc git wget + ;; netbsd) command pkgin -y install cmake gmake binutils git ;; @@ -102,7 +105,7 @@ if [ -n "$gitstatus_install_tools" ]; then sudo port -N install libiconv cmake wget elif command -v brew >/dev/null 2>&1; then for formula in libiconv cmake git wget; do - if command brew list "$formula" &>/dev/null; then + if command brew ls --version "$formula" &>/dev/null; then command brew upgrade "$formula" else command brew install "$formula" @@ -160,6 +163,13 @@ case "$gitstatus_kernel" in gitstatus_ldflags="$gitstatus_ldflags -Wl,-O1,--sort-common,--as-needed,-z,relro,-z,now" libgit2_cmake_flags="$libgit2_cmake_flags -DENABLE_REPRODUCIBLE_BUILDS=ON" ;; + openbsd) + gitstatus_cxx=eg++ + gitstatus_make=gmake + gitstatus_ldflags="$gitstatus_ldflags -static" + gitstatus_ldflags="$gitstatus_ldflags -Wl,-O1,--sort-common,--as-needed,-z,relro,-z,now" + libgit2_cmake_flags="$libgit2_cmake_flags -DENABLE_REPRODUCIBLE_BUILDS=ON" + ;; netbsd) gitstatus_make=gmake gitstatus_ldflags="$gitstatus_ldflags -static" @@ -473,7 +483,7 @@ case "$gitstatus_kernel" in fi fi ;; - freebsd|netbsd|darwin) + freebsd|openbsd|netbsd|darwin) if [ -n "$docker_cmd" ]; then >&2 echo "[error] docker (-d) is not supported on $gitstatus_kernel" exit 1 -- cgit v1.2.3