aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.github/workflows/build.yml4
-rwxr-xr-xbuild.sh2
2 files changed, 3 insertions, 3 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index e8ba198..0d7c466 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -31,5 +31,5 @@ jobs:
env: { GITHUB_TOKEN: "${{ github.token }}" }
run: |
gh release delete -y continuous || true; gh release create -t 'Continuous Release' continuous *.zip *.tar.gz *.deb
- [[ `git describe HEAD --tags` == "v"* ]] && gh release delete -y `git describe HEAD --tags` || true;
- [[ `git describe HEAD --tags` == "v"* ]] && gh release create -t `git describe HEAD --tags` `git describe HEAD --tags` lpm.x86_64-linux lpm.x86_64-windows.exe
+ [[ `git describe HEAD --tags --match=v* | head -c 4` == "v"* ]] && gh release delete -y `git describe HEAD --tags --match=v* | head -c 4` || true;
+ [[ `git describe HEAD --tags --match=v* | head -c 4` == "v"* ]] && gh release create -t `git describe HEAD --tags --match=v* | head -c 4` `git describe HEAD --tags --match=v* | head -c 4` lpm.x86_64-linux lpm.x86_64-windows.exe
diff --git a/build.sh b/build.sh
index 1cb79fb..77e9176 100755
--- a/build.sh
+++ b/build.sh
@@ -18,7 +18,7 @@ if [[ "$@" != *"-lz"* ]]; then
LDFLAGS="$LDFLAGS -Llib/libz/build -l:libz.a" && CFLAGS="$CFLAGS -Ilib/prefix/include" && LDFLAGS="$LDFLAGS -Llib/prefix/lib -Llib/prefix/lib64"
fi
if [[ "$@" != *"-lssl"* && "$@" != *"-lcrypto"* ]]; then
- [ ! -e "lib/openssl/build" ] && cd lib/openssl && mkdir build && cd build && ../Configure --prefix=`pwd`/../../prefix $SSL_CONFIGURE && $MAKE -j $JOBS && $MAKE install && cd ../../../ && ln -sf lib/prefix/lib64/libcrypto.a lib/prefix/lib/libcyrpto.a
+ [ ! -e "lib/openssl/build" ] && cd lib/openssl && mkdir build && cd build && ../Configure --prefix=`pwd`/../../prefix $SSL_CONFIGURE && $MAKE -j $JOBS && $MAKE install_sw install_ssldirs && cd ../../../ && ln -sf lib/prefix/lib64/libcrypto.a lib/prefix/lib/libcyrpto.a
LDFLAGS="$LDFLAGS -Llib/libz/build" && CFLAGS="$CFLAGS -Ilib/prefix/include" && LDFLAGS="$LDFLAGS -Llib/prefix/lib -Llib/prefix/lib64 -l:libssl.a -l:libcrypto.a"
fi
if [[ "$@" != *"-lgit2"* ]]; then