Skip to contentSkip to conversation

erofs-utils: mkfs: fix uuid.h location

PATCH In review Gao Xiang via Linux-erofs 1 participant 2 messages Dec 9, 2020 – Dec 12, 2020 1 message not in the archive

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

#1 lore raw

PATCH 1/1 erofs-utils: mkfs: fix uuid.h location

From: Gao Xiang <[email protected]>

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/[email protected]

Fixes e023d47593ff ("erofs-utils: support 128-bit filesystem UUID")
---
 mkfs/main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
mkfs/main.c +1 -1
index c63b27491a3f..abd48be0fa4f 100644
@@ -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))
Signature · 1 line
2.24.0
author Reviewed-by Li Guifu on v1 1/1
#2 lore raw
Quoted 16 lines · Gao Xiang via Linux-erofs

From: Gao Xiang <[email protected]>

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!
Quoted 9 lines

[1] https://lore.kernel.org/r/[email protected]

Fixes e023d47593ff ("erofs-utils: support 128-bit filesystem UUID")
---
 mkfs/main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

It looks good

Thanks,