maint: remove iconv workaround and vendor openssl

This commit is contained in:
Matthew Ryan Dillon 2023-05-14 17:00:18 -04:00
parent 85fb10d737
commit 3181190556
3 changed files with 11 additions and 11 deletions

10
Cargo.lock generated
View file

@ -183,6 +183,15 @@ version = "0.1.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "28988d872ab76095a6e6ac88d99b54fd267702734fd7ffe610ca27f533ddb95a"
[[package]]
name = "openssl-src"
version = "111.25.0+1.1.1t"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3173cd3626c43e3854b1b727422a276e568d9ec5fe8cec197822cf52cfb743d6"
dependencies = [
"cc",
]
[[package]]
name = "openssl-sys"
version = "0.9.63"
@ -192,6 +201,7 @@ dependencies = [
"autocfg",
"cc",
"libc",
"openssl-src",
"pkg-config",
"vcpkg",
]

View file

@ -5,7 +5,7 @@ authors = ["Matthew Dillon <matthewrdillon@gmail.com>"]
edition = "2018"
[dependencies]
git2 = "0.13"
git2 = { version = "0.13", features = ["vendored-openssl"] }
serde = { version = "1.0", features = ["derive"] }
shellexpand = "2.1"
toml = "0.5"

View file

@ -24,13 +24,3 @@ remotes = [
{ name = "thermokarst", base_addr = "ssh://git@github.com/thermokarst" },
]
```
## building and testing locally
```bash
sudo port install libiconv
sudo mkdir /opt/local/include/iconv
sudo cp /opt/local/include/iconv.h /opt/local/include/iconv/
# building
CFLAGS=-I/opt/local/include/iconv cargo build
```