]> git.ipfire.org Git - thirdparty/systemd.git/commit
build-sys: correct blkid.h includes 5708/head
authorMatt Clarkson <mattyclarkson@gmail.com>
Thu, 6 Apr 2017 13:12:17 +0000 (14:12 +0100)
committerMatt Clarkson <mattyclarkson@gmail.com>
Thu, 6 Apr 2017 13:33:02 +0000 (14:33 +0100)
commit6b5cf3ea621a5bfd218cd2249e066a52c0e73657
tree5fd7497deae254cc4094188078b08a0d9584cab9
parentcf8e2953b56281e7008a8757340801d427c994e9
build-sys: correct blkid.h includes

When using pkg-config to determine the include flags for blkid the
flags are returned as:

    $ pkg-config blkid --cflags
    -I/usr/include/blkid -I/usr/include/uuid

We use the <blkid/blkid.h> include which would be correct when using
the default compiler /usr/include header search path. However, when
cross-compiling the blkid.h will not be installed at /usr/include and
highly likely in a temporary system root. It is futher compounded if
the cross-compile packages are split up and the blkid package is not
available in the same sysroot as the compiler.

Regardless of the compilation setup, the correct include path should be
<blkid.h> if using the pkg-config returned CFLAGS.
src/basic/blkid-util.h
src/boot/bootctl.c
src/gpt-auto-generator/gpt-auto-generator.c
src/nspawn/nspawn.c
src/udev/udev-builtin-blkid.c