diff options
| author | Maxim Cournoyer <[email protected]> | 2023-04-14 16:57:37 -0400 |
|---|---|---|
| committer | Maxim Cournoyer <[email protected]> | 2023-04-14 17:15:08 -0400 |
| commit | 3bacd3c76a58ebe70f98be654f09cbd4166093ab (patch) | |
| tree | 89f687565205971a9925d33400235968a569a069 /gnu/packages/patches/rust-openssl-sys-no-vendor.patch | |
| parent | df3391c0309443ac37f9a9a6b1038a85454b8ee6 (diff) | |
| parent | 97ed675718b948319e6f6e51f2d577971bea1176 (diff) | |
Merge branch 'master' into core-updates.
Conflicts:
gnu/local.mk
gnu/packages/build-tools.scm
gnu/packages/certs.scm
gnu/packages/check.scm
gnu/packages/compression.scm
gnu/packages/cups.scm
gnu/packages/fontutils.scm
gnu/packages/gnuzilla.scm
gnu/packages/guile.scm
gnu/packages/ibus.scm
gnu/packages/image-processing.scm
gnu/packages/linux.scm
gnu/packages/music.scm
gnu/packages/nss.scm
gnu/packages/pdf.scm
gnu/packages/python-xyz.scm
gnu/packages/qt.scm
gnu/packages/ruby.scm
gnu/packages/shells.scm
gnu/packages/tex.scm
gnu/packages/video.scm
gnu/packages/vulkan.scm
gnu/packages/web.scm
gnu/packages/webkit.scm
gnu/packages/wm.scm
Diffstat (limited to 'gnu/packages/patches/rust-openssl-sys-no-vendor.patch')
| -rw-r--r-- | gnu/packages/patches/rust-openssl-sys-no-vendor.patch | 30 |
1 files changed, 18 insertions, 12 deletions
diff --git a/gnu/packages/patches/rust-openssl-sys-no-vendor.patch b/gnu/packages/patches/rust-openssl-sys-no-vendor.patch index 3e300ea69e..5872d4cf22 100644 --- a/gnu/packages/patches/rust-openssl-sys-no-vendor.patch +++ b/gnu/packages/patches/rust-openssl-sys-no-vendor.patch @@ -1,12 +1,17 @@ -https://sources.debian.org/data/main/r/rust-openssl-sys/0.9.53-1/debian/patches/disable-vendor.patch -"MIT" licensed according to debian/copyright file -slightly modified to only change the vendored openssl-src dependency - -Starting from [email protected] Cargo.toml starts searching for openssl-3.0. - ---- a/Cargo.toml -+++ b/Cargo.toml -@@ -31,15 +31,12 @@ +--- openssl-sys-0.9.84/Cargo.toml.orig 2023-04-03 09:10:11.979197979 -0400 ++++ openssl-sys-0.9.84/Cargo.toml 2023-04-03 12:07:30.285315609 -0400 +@@ -31,10 +31,6 @@ + [package.metadata.pkg-config] + openssl = "1.0.1" + +-[dependencies.bssl-sys] +-version = "0.1.0" +-optional = true +- + [dependencies.libc] + version = "0.2" + +@@ -46,16 +42,12 @@ [build-dependencies.cc] version = "1.0" @@ -18,9 +23,10 @@ Starting from [email protected] Cargo.toml starts searching for openssl-3. version = "0.3.9" [features] - vendored = ["openssl-src"] -+openssl-src = [] +-unstable_boringssl = ["bssl-sys"] +-vendored = ["openssl-src"] ++unstable_boringssl = [] ++vendored = [] [target."cfg(target_env = \"msvc\")".build-dependencies.vcpkg] version = "0.2.8" - |