keremet/rpm-ostree
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

libdnf: Various buildsys fixes

Browse Source 
WITH_SWDB: Removed in 99309fbe04
WITH_GIR Removed in e2f2862bed

Also, most importantly: don't always reconfigure libdnf

This is a questionable default for the cargo `cmake` crate.
Building in Koji is failing I think due to timestamp issues
causing cmake to run twice.
This commit is contained in:
Colin Walters 2021-02-04 18:30:49 +00:00 committed by OpenShift Merge Robot
parent f5fde004dc
commit 47c60eb6ce
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
rust/libdnf-sys/build.rs
View File

@ -18,14 +18,15 @@ fn main() -> Result<()> {
.define("SHARE_INSTALL_PREFIX:PATH", "/usr/libexec/rpm-ostree/share") .define("SHARE_INSTALL_PREFIX:PATH", "/usr/libexec/rpm-ostree/share")
.define("ENABLE_STATIC:BOOL", "1") .define("ENABLE_STATIC:BOOL", "1")
.define("CMAKE_POSITION_INDEPENDENT_CODE", "ON") .define("CMAKE_POSITION_INDEPENDENT_CODE", "ON")
// rpm-ostree maintains its own state
.define("WITH_SWDB:BOOL", "0")
// We don't need docs // We don't need docs
.define("WITH_HTML:BOOL", "0") .define("WITH_HTML:BOOL", "0")
.define("WITH_MAN:BOOL", "0") .define("WITH_MAN:BOOL", "0")
// Don't need bindings // Don't need bindings
.define("WITH_BINDINGS:BOOL", "0") .define("WITH_BINDINGS:BOOL", "0")
.define("WITH_GIR:BOOL", "0") // Needed in Koji at least because timestamps(?)
// cause cmake to rerun without our -D flags which
// breaks the build.
.always_configure(false)
.build_target("all") .build_target("all")
.build(); .build();
println!( println!(