From 85cf6dc3a5dcb5efa6ed78bd6baa0be262674760 Mon Sep 17 00:00:00 2001 From: Bruce Richardson Date: Wed, 3 Jul 2019 17:40:01 +0100 Subject: [PATCH] devtools: fix lib directory in pkg-config test With Debian and Ubuntu, the default installation path for the 64-bit libraries is set to e.g. /usr/local/lib/x86_64-linux-gnu/, compared to /usr/local/lib64 on Fedora and Redhat distributions. This causes issues when using "pkg-config --define-prefix" since pkg-config assumes the prefix to be the grandparent of where the .pc file is. On Ubuntu we then get the cflags include path as being "/path/to/install-root/usr/local/lib/include" i.e. with an extra "lib" in the path. This issue only applies for test installs on Ubuntu and similar distros, and is not a problem for regular installs since the --define-prefix parameter would not be passed to pkg-config in those cases. The workaround for this in our test build script is to explicitly make "lib" the "libdir" setting for the install, overriding the distro-provided default. Fixes: 7f80a2102bbb ("devtools: test pkg-config file") Signed-off-by: Bruce Richardson Acked-by: Luca Boccassi --- devtools/test-meson-builds.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/devtools/test-meson-builds.sh b/devtools/test-meson-builds.sh index 57d1af47ef..9fe0a04c9e 100755 --- a/devtools/test-meson-builds.sh +++ b/devtools/test-meson-builds.sh @@ -76,12 +76,14 @@ for c in gcc clang ; do done # test compilation with minimal x86 instruction set +# Set the install path for libraries to "lib" explicitly to prevent problems +# with pkg-config prefixes if installed in "lib/x86_64-linux-gnu" later. default_machine='nehalem' ok=$(cc -march=$default_machine -E - < /dev/null > /dev/null 2>&1 || echo false) if [ "$ok" = "false" ] ; then default_machine='corei7' fi -build build-x86-default -Dmachine=$default_machine $use_shared +build build-x86-default -Dlibdir=lib -Dmachine=$default_machine $use_shared # enable cross compilation if gcc cross-compiler is found c=aarch64-linux-gnu-gcc -- 2.20.1