1
1
mirror of https://github.com/systemd/systemd-stable.git synced 2024-12-23 17:34:00 +03:00

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.
This commit is contained in:
Matt Clarkson 2017-04-06 14:12:17 +01:00
parent cf8e2953b5
commit 6b5cf3ea62
5 changed files with 5 additions and 5 deletions

View File

@ -20,7 +20,7 @@
***/ ***/
#ifdef HAVE_BLKID #ifdef HAVE_BLKID
#include <blkid/blkid.h> #include <blkid.h>
#endif #endif
#include "util.h" #include "util.h"

View File

@ -19,7 +19,7 @@
***/ ***/
#include <assert.h> #include <assert.h>
#include <blkid/blkid.h> #include <blkid.h>
#include <ctype.h> #include <ctype.h>
#include <dirent.h> #include <dirent.h>
#include <errno.h> #include <errno.h>

View File

@ -17,7 +17,7 @@
along with systemd; If not, see <http://www.gnu.org/licenses/>. along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/ ***/
#include <blkid/blkid.h> #include <blkid.h>
#include <stdlib.h> #include <stdlib.h>
#include <sys/statfs.h> #include <sys/statfs.h>
#include <unistd.h> #include <unistd.h>

View File

@ -18,7 +18,7 @@
***/ ***/
#ifdef HAVE_BLKID #ifdef HAVE_BLKID
#include <blkid/blkid.h> #include <blkid.h>
#endif #endif
#include <errno.h> #include <errno.h>
#include <getopt.h> #include <getopt.h>

View File

@ -18,7 +18,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include <blkid/blkid.h> #include <blkid.h>
#include <errno.h> #include <errno.h>
#include <fcntl.h> #include <fcntl.h>
#include <getopt.h> #include <getopt.h>