removed dynamic libssl dep

This commit is contained in:
veeso
2022-07-20 12:37:22 +02:00
parent 82489e7459
commit f5174ccac0
4 changed files with 13 additions and 47 deletions

14
Cargo.lock generated
View File

@@ -1619,6 +1619,15 @@ version = "0.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
[[package]]
name = "openssl-src"
version = "111.22.0+1.1.1q"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8f31f0d509d1c1ae9cada2f9539ff8f37933831fd5098879e482aa687d659853"
dependencies = [
"cc",
]
[[package]]
name = "openssl-sys"
version = "0.9.74"
@@ -1628,6 +1637,7 @@ dependencies = [
"autocfg",
"cc",
"libc",
"openssl-src",
"pkg-config",
"vcpkg",
]
@@ -1951,9 +1961,9 @@ dependencies = [
[[package]]
name = "remotefs-ssh"
version = "0.1.0"
version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7f2c6959740eeee7e773166e79dd52c7dea41f791456aa5addfb949c61c15b27"
checksum = "ea2ac5a7f475c1b63ffd2aaab57ca4e37e6a6ed23461046d4fb1554835e6088a"
dependencies = [
"chrono",
"lazy_static",

View File

@@ -51,7 +51,7 @@ regex = "1.5.6"
remotefs = "^0.2.0"
remotefs-aws-s3 = "^0.2.0"
remotefs-ftp = { version = "^0.1.0", features = [ "secure" ] }
remotefs-ssh = "^0.1.0"
remotefs-ssh = { version = "^0.1.1", features = [ "ssh2-vendored" ] }
rpassword = "6.0.1"
self_update = { version = "0.30.0", features = [ "archive-tar", "archive-zip", "compression-flate2", "compression-zip-deflate" ] }
serde = { version = "^1.0.0", features = [ "derive" ] }

View File

@@ -179,11 +179,9 @@ For more information or other platforms, please visit [veeso.github.io](https://
### Requirements ❗
- **Linux** users:
- libssh
- libdbus-1
- pkg-config
- **FreeBSD** users:
- libssh
- dbus
- pkgconf

42
dist/build/macos.sh vendored
View File

@@ -18,41 +18,6 @@ make_pkg() {
echo "$HASH"
}
build_openssl_arm64() {
# setup dirs
BUILD_DIR=$(pwd)
OPENSSL_BUILD_DIR=/tmp/openssl-build/
# setup openssl dir
mkdir -p $OPENSSL_DIR
cd $OPENSSL_DIR
# check if openssl has already been compiled
if [ -e ./include/ ]; then
return 0
fi
# download package
TEMP_TGZ=/tmp/openssl.tar.gz
wget https://www.openssl.org/source/openssl-1.1.1m.tar.gz -O $TEMP_TGZ
# setup build dir
mkdir -p $OPENSSL_BUILD_DIR
cd $OPENSSL_BUILD_DIR
# extract sources
tar xzvf $TEMP_TGZ
rm $TEMP_TGZ
# build
cd openssl-1.1.1m/
export MACOSX_DEPLOYMENT_TARGET=10.15
./Configure enable-rc5 zlib darwin64-arm64-cc no-asm
make
make install DESTDIR=$(pwd)/out/
# copy compiled assets to openssl dir
cp -r out/usr/local/* $OPENSSL_DIR/
# go back to build dir
cd $BUILD_DIR
# delete temp dir
rm -rf $OPENSSL_BUILD_DIR
return 0
}
if [ -z "$1" ]; then
echo "Usage: macos.sh <version>"
exit 1
@@ -76,13 +41,6 @@ cargo build --release
# Make pkg
X86_64_HASH=$(make_pkg "x86_64" $VERSION)
# set openssl dir
export OPENSSL_DIR=$BUILD_ROOT/dist/build/macos/openssl/
export OPENSSL_STATIC=1
export OPENSSL_LIB_DIR=${OPENSSL_DIR}/lib/
export OPENSSL_INCLUDE_DIR=${OPENSSL_DIR}/include/
# build openssl
build_openssl_arm64
cd $BUILD_ROOT
# Build ARM64 pkg
cargo build --release --target aarch64-apple-darwin