min
/
boring2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1010 from sfackler/libressl-28x 

Support LibreSSL 2.8.x
This commit is contained in:
Steven Fackler 2018-10-18 09:30:00 -07:00 committed by GitHub
parent c482f6d8dc 9fd7584a84
commit 63b50746ec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
.circleci/config.yml
View File

@ -106,12 +106,9 @@ openssl_101: &OPENSSL_101
libressl_250: &LIBRESSL_250 libressl_250: &LIBRESSL_250
LIBRARY: libressl LIBRARY: libressl
VERSION: 2.5.0 VERSION: 2.5.0
libressl_270: &LIBRESSL_280 libressl_28x: &LIBRESSL_28x
LIBRARY: libressl LIBRARY: libressl
VERSION: 2.8.0 VERSION: 2.8.2
libressl_281: &LIBRESSL_281
LIBRARY: libressl
VERSION: 2.8.1
x86_64: &X86_64 x86_64: &X86_64
TARGET: x86_64-unknown-linux-gnu TARGET: x86_64-unknown-linux-gnu
@ -196,14 +193,10 @@ jobs:
<<: *JOB <<: *JOB
environment: environment:
<<: [*LIBRESSL_250, *X86_64, *BASE] <<: [*LIBRESSL_250, *X86_64, *BASE]
x86_64-libressl-2.8.0: x86_64-libressl-2.8.x:
<<: *JOB <<: *JOB
environment: environment:
<<: [*LIBRESSL_280, *X86_64, *BASE] <<: [*LIBRESSL_28x, *X86_64, *BASE]
x86_64-libressl-2.8.1:
<<: *JOB
environment:
<<: [*LIBRESSL_281, *X86_64, *BASE]
macos: macos:
<<: *MACOS_JOB <<: *MACOS_JOB
environment: environment:
@ -231,7 +224,6 @@ workflows:
- armhf-openssl-1.1.0 - armhf-openssl-1.1.0
- armhf-openssl-1.0.2 - armhf-openssl-1.0.2
- x86_64-libressl-2.5.0 - x86_64-libressl-2.5.0
- x86_64-libressl-2.8.0 - x86_64-libressl-2.8.x
- x86_64-libressl-2.8.1
- macos - macos
- macos-vendored - macos-vendored

14
openssl-sys/build/main.rs
View File

@ -1,9 +1,9 @@
extern crate cc; extern crate cc;
#[cfg(feature = "vendored")]
extern crate openssl_src;
extern crate pkg_config; extern crate pkg_config;
#[cfg(target_env = "msvc")] #[cfg(target_env = "msvc")]
extern crate vcpkg; extern crate vcpkg;
#[cfg(feature = "vendored")]
extern crate openssl_src;
use std::collections::HashSet; use std::collections::HashSet;
use std::env; use std::env;
@ -103,20 +103,23 @@ fn main() {
#[cfg(feature = "vendored")] #[cfg(feature = "vendored")]
mod imp { mod imp {
use std::path::PathBuf;
use openssl_src; use openssl_src;
use std::path::PathBuf;
pub fn get_openssl(_target: &str) -> (PathBuf, PathBuf) { pub fn get_openssl(_target: &str) -> (PathBuf, PathBuf) {
let artifacts = openssl_src::Build::new().build(); let artifacts = openssl_src::Build::new().build();
(artifacts.lib_dir().to_path_buf(), artifacts.include_dir().to_path_buf()) (
artifacts.lib_dir().to_path_buf(),
artifacts.include_dir().to_path_buf(),
)
} }
} }
#[cfg(not(feature = "vendored"))] #[cfg(not(feature = "vendored"))]
mod imp { mod imp {
use pkg_config; use pkg_config;
use std::path::{Path, PathBuf};
use std::ffi::OsString; use std::ffi::OsString;
use std::path::{Path, PathBuf};
use std::process::{self, Command}; use std::process::{self, Command};
use super::env; use super::env;
@ -500,6 +503,7 @@ See rust-openssl README for more information:
(7, _) => ('7', 'x'), (7, _) => ('7', 'x'),
(8, 0) => ('8', '0'), (8, 0) => ('8', '0'),
(8, 1) => ('8', '1'), (8, 1) => ('8', '1'),
(8, _) => ('8', 'x'),
_ => version_error(), _ => version_error(),
}; };