luxolus
/
pyo3
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rename all cross compile variables to PYO3_CROSS_* prefix

This commit is contained in:
Matt Pelland 2019-01-30 17:47:20 -05:00
parent 8721f410e1
commit 7232323248
No known key found for this signature in database
GPG Key ID: A696205C3D16B22E
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
README.md
View File

@ -32,11 +32,9 @@ sudo apt install python3-dev python-dev
Cross compiling Pyo3 modules requires setting the following environment
variables:
- `PYO3_XC`: This variable must be set to indicate a cross compilation
environment. The value does not matter.
- `PYO3_XC_PYTHON_INCLUDE_DIR`: This variable must be set to the directory
- `PYO3_CROSS_INCLUDE_DIR`: This variable must be set to the directory
containing the headers for the target's python interpreter.
- `PYO3_XC_PYTHON_LIB_DIR`: This variable must be set to the directory
- `PYO3_CROSS_LIB_DIR`: This variable must be set to the directory
containing the target's libpython DSO.
## Using rust from python

8
build.rs
View File

@ -124,8 +124,7 @@ fn fix_config_map(mut config_map: HashMap<String, String>) -> HashMap<String, St
fn load_cross_compile_info() -> Result<(PythonVersion, HashMap<String, String>, Vec<String>), String>
{
let python_include_dir =
env::var("PYO3_XC_PYTHON_INCLUDE_DIR").expect("PYO3_XC_PYTHON_INCLUDE_DIR must be defined");
let python_include_dir = env::var("PYO3_CROSS_INCLUDE_DIR").unwrap();
let python_include_dir = Path::new(&python_include_dir);
let patchlevel_defines = parse_header_defines(python_include_dir.join("patchlevel.h"))?;
@ -149,7 +148,7 @@ fn load_cross_compile_info() -> Result<(PythonVersion, HashMap<String, String>,
let config_lines = vec![
"".to_owned(), // compatibility, not used when cross compiling.
env::var("PYO3_XC_PYTHON_LIB_DIR").expect("PYO3_XC_PYTHON_LIB_DIR must be defined"),
env::var("PYO3_CROSS_LIB_DIR").unwrap(),
config_map
.get("Py_ENABLE_SHARED")
.expect("Py_ENABLE_SHARED undefined")
@ -562,7 +561,8 @@ fn main() {
// If you have troubles with your shell accepting '.' in a var name,
// try using 'env' (sorry but this isn't our fault - it just has to
// match the pkg-config package name, which is going to have a . in it).
let cross_compiling = env::var("PYO3_XC").is_ok();
let cross_compiling =
env::var("PYO3_CROSS_INCLUDE_DIR").is_ok() && env::var("PYO3_CROSS_LIB_DIR").is_ok();
let (interpreter_version, mut config_map, lines) = if cross_compiling {
load_cross_compile_info()
} else {