Skip to content

Commit 224a9a3

Browse files
all around: disable print_system_libs in calls to pkg-config
By default, pkg-config-rs sets the PKG_CONFIG_ALLOW_SYSTEM_LIBS environment variable (rust-lang/pkg-config-rs#35), which leads to eg /usr/lib being present in the middle of the final command, in turn leading to issues when working in an uninstalled environment, where libraries that are also present system-wide do not get linked against.
1 parent 5ba2b2a commit 224a9a3

File tree

14 files changed

+22
-9
lines changed

14 files changed

+22
-9
lines changed

gstreamer-app-sys/build.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ fn find() -> Result<(), Error> {
4545

4646
let mut config = Config::new();
4747
config.atleast_version(version);
48+
config.print_system_libs(false);
4849
if hardcode_shared_libs {
4950
config.cargo_metadata(false);
5051
}

gstreamer-audio-sys/build.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ fn find() -> Result<(), Error> {
4545

4646
let mut config = Config::new();
4747
config.atleast_version(version);
48+
config.print_system_libs(false);
4849
if hardcode_shared_libs {
4950
config.cargo_metadata(false);
5051
}

gstreamer-base-sys/build.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ fn find() -> Result<(), Error> {
4949

5050
let mut config = Config::new();
5151
config.atleast_version(version);
52+
config.print_system_libs(false);
5253
if hardcode_shared_libs {
5354
config.cargo_metadata(false);
5455
}

gstreamer-mpegts-sys/build.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ fn find() -> Result<(), Error> {
3333

3434
let mut config = Config::new();
3535
config.atleast_version(version);
36+
config.print_system_libs(false);
3637
if hardcode_shared_libs {
3738
config.cargo_metadata(false);
3839
}

gstreamer-net-sys/build.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ fn find() -> Result<(), Error> {
4545

4646
let mut config = Config::new();
4747
config.atleast_version(version);
48+
config.print_system_libs(false);
4849
if hardcode_shared_libs {
4950
config.cargo_metadata(false);
5051
}

gstreamer-pbutils-sys/build.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ fn find() -> Result<(), Error> {
4343

4444
let mut config = Config::new();
4545
config.atleast_version(version);
46+
config.print_system_libs(false);
4647
if hardcode_shared_libs {
4748
config.cargo_metadata(false);
4849
}

gstreamer-player-sys/build.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ fn find() -> Result<(), Error> {
3333

3434
let mut config = Config::new();
3535
config.atleast_version(version);
36+
config.print_system_libs(false);
3637
if hardcode_shared_libs {
3738
config.cargo_metadata(false);
3839
}

gstreamer-rtsp-server-sys/Cargo.toml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,6 @@ pkg-config = "0.3.7"
99
bitflags = "1.0"
1010
libc = "0.2"
1111

12-
[dependencies.gio-sys]
13-
git = "https://github.com/gtk-rs/sys"
14-
15-
[dependencies.glib-sys]
16-
git = "https://github.com/gtk-rs/sys"
17-
18-
[dependencies.gobject-sys]
19-
git = "https://github.com/gtk-rs/sys"
20-
2112
[dependencies.gstreamer-net-sys]
2213
path = "../gstreamer-net-sys"
2314

@@ -30,6 +21,15 @@ path = "../gstreamer-sdp-sys"
3021
[dependencies.gstreamer-sys]
3122
path = "../gstreamer-sys"
3223

24+
[dependencies.gio-sys]
25+
git = "https://github.com/gtk-rs/sys"
26+
27+
[dependencies.glib-sys]
28+
git = "https://github.com/gtk-rs/sys"
29+
30+
[dependencies.gobject-sys]
31+
git = "https://github.com/gtk-rs/sys"
32+
3333
[features]
3434
dox = []
3535
v1_4 = []

gstreamer-rtsp-server-sys/build.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ fn find() -> Result<(), Error> {
3939

4040
let mut config = Config::new();
4141
config.atleast_version(version);
42+
config.print_system_libs(false);
4243
if hardcode_shared_libs {
4344
config.cargo_metadata(false);
4445
}

gstreamer-rtsp-sys/build.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ fn find() -> Result<(), Error> {
4141

4242
let mut config = Config::new();
4343
config.atleast_version(version);
44+
config.print_system_libs(false);
4445
if hardcode_shared_libs {
4546
config.cargo_metadata(false);
4647
}

0 commit comments

Comments
 (0)