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

Simplify building a bit

This commit is contained in:
konstin 2018-07-03 20:40:42 +02:00
parent e374b5dd1d
commit 2f1e1a2a3f
2 changed files with 4 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
build.rs
View File

@ -77,6 +77,9 @@ static SYSCONFIG_VALUES: [&'static str; 1] = [
/// sysconfig.get_config_vars.
#[cfg(not(target_os = "windows"))]
fn get_config_vars(python_path: &String) -> Result<HashMap<String, String>, String> {
// FIXME: We can do much better here using serde:
// import json, sysconfig; print(json.dumps({k:str(v) for k, v in sysconfig.get_config_vars().items()}))
let mut script = "import sysconfig; \
config = sysconfig.get_config_vars();"
.to_owned();
@ -510,13 +513,7 @@ fn main() {
}
);
let env_vars = [
"LD_LIBRARY_PATH",
"LIBRARY_PATH",
"PATH",
"PYTHON_LIB",
"PYTHON_SYS_EXECUTABLE",
];
let env_vars = ["LD_LIBRARY_PATH", "PATH", "PYTHON_SYS_EXECUTABLE"];
for var in env_vars.iter() {
println!("cargo:rerun-if-env-changed={}", var);

20
ci/travis/setup.sh
View File

@ -51,23 +51,3 @@ cmake .
make
install src/kcov $HOME/.cargo/bin/kcov
cd $TRAVIS_BUILD_DIR
### Setup python linker flags ##################################################
python -c """
import sysconfig
cfg = sorted(sysconfig.get_config_vars().items())
print('\n'.join(['{}={}'.format(*x) for x in cfg]))
"""
export PYTHON_LIB=$(python -c "import sysconfig as s; print(s.get_config_var('LIBDIR'))")
# find $PYTHON_LIB
export LIBRARY_PATH="$LIBRARY_PATH:$PYTHON_LIB"
# delete any possible empty components
# https://github.com/google/pulldown-cmark/issues/122#issuecomment-364948741
LIBRARY_PATH=$(echo $LIBRARY_PATH | sed -E -e 's/^:*//' -e 's/:*$//' -e 's/:+/:/g')
export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$PYTHON_LIB:$HOME/rust/lib"