diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2019-03-18 12:09:41 +0100 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2019-03-19 07:00:18 +0100 |
| commit | 6b61731f19028cd0e2ce6d7cbc8720721d72341b (patch) | |
| tree | 6cb80b751f2b7fe5d9d7be4de0dd98c1069b865b /scripts/pkg-config-wrapper | |
| parent | 3e0846bd9b735e197d8d362fac77c71c776f26ff (diff) | |
| download | ptxdist-6b61731f19028cd0e2ce6d7cbc8720721d72341b.tar.gz ptxdist-6b61731f19028cd0e2ce6d7cbc8720721d72341b.tar.xz | |
pkg-config-wrapper: don't allow system paths
Meson tries to use this to find the absolute library files. However, we
also use the system paths to filter out /usr/lib etc, so if
PKG_CONFIG_ALLOW_SYSTEM_LIBS=1 is set then pkg-config might produce
-L/usr/lib.
Always unset these variables. This forces meson to fall back to -l<lib>.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'scripts/pkg-config-wrapper')
| -rwxr-xr-x | scripts/pkg-config-wrapper | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/scripts/pkg-config-wrapper b/scripts/pkg-config-wrapper index b1af191f4..d9e111d6c 100755 --- a/scripts/pkg-config-wrapper +++ b/scripts/pkg-config-wrapper @@ -26,6 +26,10 @@ IFS=":" # make sure no other sysroot is set # it conflicts with our own sysroot handling unset PKG_CONFIG_SYSROOT_DIR +# never allow systemd paths +# they may include /usr/{lib,include} which is never correct +unset PKG_CONFIG_ALLOW_SYSTEM_CFLAGS +unset PKG_CONFIG_ALLOW_SYSTEM_LIBS # default pkg-config searchs export PKG_CONFIG_LIBDIR="${libdir[*]}" # default search path that will be dropped from --libs |