linux-erofs.lists.ozlabs.org archive mirror
 help / color / mirror / Atom feed
From: Gao Xiang via Linux-erofs <linux-erofs@lists.ozlabs.org>
To: linux-erofs@lists.ozlabs.org
Cc: Karel Zak <kzak@redhat.com>
Subject: [PATCH] erofs-utils: mkfs: fix uuid.h location
Date: Wed,  9 Dec 2020 08:49:37 +0800	[thread overview]
Message-ID: <20201209004937.1672-1-hsiangkao@aol.com> (raw)
In-Reply-To: 20201209004937.1672-1-hsiangkao.ref@aol.com

From: Gao Xiang <hsiangkao@aol.com>

As Karel reported [1], "The subdirectory in
    #include <uuid/uuid.h>

is unnecessary (or wrong), if you use
    PKG_CHECK_MODULES([libuuid], [uuid])

than it returns the subdirectory as -I, see

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

so the correct way is
     #include <uuid.h>". Let's fix it now!

[1] https://lore.kernel.org/r/20201208100910.dqqh5cqihewkyetc@ws.net.home

Reported-by: Karel Zak <kzak@redhat.com>
Fixes: e023d47593ff ("erofs-utils: support 128-bit filesystem UUID")
Signed-off-by: Gao Xiang <hsiangkao@aol.com>
---
 mkfs/main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mkfs/main.c b/mkfs/main.c
index c63b27491a3f..abd48be0fa4f 100644
--- a/mkfs/main.c
+++ b/mkfs/main.c
@@ -24,7 +24,7 @@
 #include "erofs/exclude.h"
 
 #ifdef HAVE_LIBUUID
-#include <uuid/uuid.h>
+#include <uuid.h>
 #endif
 
 #define EROFS_SUPER_END (EROFS_SUPER_OFFSET + sizeof(struct erofs_super_block))
-- 
2.24.0


       reply	other threads:[~2020-12-09  0:50 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <20201209004937.1672-1-hsiangkao.ref@aol.com>
2020-12-09  0:49 ` Gao Xiang via Linux-erofs [this message]
2020-12-12  9:04   ` [PATCH] erofs-utils: mkfs: fix uuid.h location Li GuiFu via Linux-erofs

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20201209004937.1672-1-hsiangkao@aol.com \
    --to=linux-erofs@lists.ozlabs.org \
    --cc=hsiangkao@aol.com \
    --cc=kzak@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).