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 <bruce.richardson@intel.com> Acked-by: Luca Boccassi <bluca@debian.org>
This commit is contained in:
parent
4131ad5db7
commit
85cf6dc3a5
@ -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
|
||||
|
Loading…
x
Reference in New Issue
Block a user