Unverified Commit 63b50746 authored by Steven Fackler's avatar Steven Fackler Committed by GitHub
Browse files

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

Support LibreSSL 2.8.x
parents c482f6d8 9fd7584a

.circleci/config.yml

+5 −13
Original line number Diff line number Diff line
@@ -106,12 +106,9 @@ openssl_101: &OPENSSL_101 
libressl_250: &LIBRESSL_250

  LIBRARY: libressl

  VERSION: 2.5.0

libressl_270: &LIBRESSL_280

libressl_28x: &LIBRESSL_28x

  LIBRARY: libressl

  VERSION: 2.8.0

libressl_281: &LIBRESSL_281

  LIBRARY: libressl

  VERSION: 2.8.1

  VERSION: 2.8.2



x86_64: &X86_64

  TARGET: x86_64-unknown-linux-gnu
@@ -196,14 +193,10 @@ jobs: 
    <<: *JOB

    environment:

      <<: [*LIBRESSL_250, *X86_64, *BASE]

  x86_64-libressl-2.8.0:

    <<: *JOB

    environment:

      <<: [*LIBRESSL_280, *X86_64, *BASE]

  x86_64-libressl-2.8.1:

  x86_64-libressl-2.8.x:

    <<: *JOB

    environment:

      <<: [*LIBRESSL_281, *X86_64, *BASE]

      <<: [*LIBRESSL_28x, *X86_64, *BASE]

  macos:

    <<: *MACOS_JOB

    environment:
@@ -231,7 +224,6 @@ workflows: 
    - armhf-openssl-1.1.0

    - armhf-openssl-1.0.2

    - x86_64-libressl-2.5.0

    - x86_64-libressl-2.8.0

    - x86_64-libressl-2.8.1

    - x86_64-libressl-2.8.x

    - macos

    - macos-vendored

openssl-sys/build/main.rs

+14 −10
Original line number Diff line number Diff line 
extern crate cc;

#[cfg(feature = "vendored")]

extern crate openssl_src;

extern crate pkg_config;

#[cfg(target_env = "msvc")]

extern crate vcpkg;

#[cfg(feature = "vendored")]

extern crate openssl_src;



use std::collections::HashSet;

use std::env;
@@ -103,20 +103,23 @@ fn main() { 


#[cfg(feature = "vendored")]

mod imp {

	use std::path::PathBuf;

    use openssl_src;

    use std::path::PathBuf;



    pub fn get_openssl(_target: &str) -> (PathBuf, PathBuf) {

        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"))]

mod imp {

    use pkg_config;

    use std::path::{Path, PathBuf};

    use std::ffi::OsString;

    use std::path::{Path, PathBuf};

    use std::process::{self, Command};



    use super::env;
@@ -500,6 +503,7 @@ See rust-openssl README for more information: 
            (7, _) => ('7', 'x'),

            (8, 0) => ('8', '0'),

            (8, 1) => ('8', '1'),

            (8, _) => ('8', 'x'),

            _ => version_error(),

        };