diff options
author | Eli Schwartz <eschwartz@archlinux.org> | 2019-04-14 20:56:17 -0400 |
---|---|---|
committer | Allan McRae <allan@archlinux.org> | 2019-05-08 10:15:52 +1000 |
commit | 583f3122ce3b98c384165d47c126aaa5c98ea392 (patch) | |
tree | 7911ddb98de66b6dd94a8aba46acc9630fd4f44e | |
parent | 6911904a033c1494f32f438f2d5cac2dc5b1ee19 (diff) | |
download | pacman-583f3122ce3b98c384165d47c126aaa5c98ea392.tar.xz |
meson: fix build of executables with nonstandard libarchive path
The libarchive header is used in alpm.h, and several binaries include
this header. This is noticeably a problem when using e.g. the musl-gcc
compiler which does not include /usr/include by default, and thus the
build system reports:
...../lib/libalpm/alpm.h:35:10: fatal error: archive.h: No such file or directory
More commonly, this will result in compiling against potentially the
wrong headers, if the libarchive installation picked up by pkg-config is
different from the one with headers in /usr/include, and /usr/include is
in the -isystem path.
Signed-off-by: Eli Schwartz <eschwartz@archlinux.org>
Signed-off-by: Allan McRae <allan@archlinux.org>
-rw-r--r-- | meson.build | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/meson.build b/meson.build index cbd4b5d0..91f05031 100644 --- a/meson.build +++ b/meson.build @@ -387,6 +387,7 @@ executable( pacman_conf_sources, include_directories : includes, link_with : [libalpm], + dependencies : [libarchive], install : true, ) @@ -395,6 +396,7 @@ executable( testpkg_sources, include_directories : includes, link_with : [libalpm], + dependencies : [libarchive], install : true, ) |