* [f2fs-dev] [PATCH 1/4] lib: fix include path for uuid.h
@ 2020-06-15 18:08 Jaegeuk Kim
2020-06-15 18:08 ` [f2fs-dev] [PATCH 2/4] lib: fix include path for blkid.h Jaegeuk Kim
` (3 more replies)
0 siblings, 4 replies; 8+ messages in thread
From: Jaegeuk Kim @ 2020-06-15 18:08 UTC (permalink / raw)
To: linux-f2fs-devel; +Cc: Jaegeuk Kim, Rolf Eike Beer
From: Rolf Eike Beer <eb@emlix.com>
$ pkg-config --cflags uuid
-I/usr/include/uuid
The "uuid/" directory is actually part of the include path. This usually still
works because most people have the path one level up in their default include
path.
Signed-off-by: Rolf Eike Beer <eb@emlix.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
---
mkfs/f2fs_format.c | 2 +-
mkfs/f2fs_format_main.c | 2 +-
tools/f2fscrypt.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/mkfs/f2fs_format.c b/mkfs/f2fs_format.c
index 44575e0..4999cac 100644
--- a/mkfs/f2fs_format.c
+++ b/mkfs/f2fs_format.c
@@ -18,7 +18,7 @@
#include <sys/mount.h>
#endif
#include <time.h>
-#include <uuid/uuid.h>
+#include <uuid.h>
#include "f2fs_fs.h"
#include "quota.h"
diff --git a/mkfs/f2fs_format_main.c b/mkfs/f2fs_format_main.c
index 204a410..282c94e 100644
--- a/mkfs/f2fs_format_main.c
+++ b/mkfs/f2fs_format_main.c
@@ -18,7 +18,7 @@
#include <sys/mount.h>
#endif
#include <time.h>
-#include <uuid/uuid.h>
+#include <uuid.h>
#include <errno.h>
#include "config.h"
diff --git a/tools/f2fscrypt.c b/tools/f2fscrypt.c
index fe3e0ff..d5bc3c5 100644
--- a/tools/f2fscrypt.c
+++ b/tools/f2fscrypt.c
@@ -43,7 +43,7 @@
#ifdef __KERNEL__
#include <linux/fs.h>
#endif
-#include <uuid/uuid.h>
+#include <uuid.h>
#if !defined(HAVE_ADD_KEY) || !defined(HAVE_KEYCTL)
#include <sys/syscall.h>
--
2.27.0.290.gba653c62da-goog
_______________________________________________
Linux-f2fs-devel mailing list
Linux-f2fs-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
^ permalink raw reply related [flat|nested] 8+ messages in thread* [f2fs-dev] [PATCH 2/4] lib: fix include path for blkid.h
2020-06-15 18:08 [f2fs-dev] [PATCH 1/4] lib: fix include path for uuid.h Jaegeuk Kim
@ 2020-06-15 18:08 ` Jaegeuk Kim
2020-06-18 3:33 ` Chao Yu
2020-06-15 18:08 ` [f2fs-dev] [PATCH 3/4] lib: use ${libuuid_LIBS} instead of -luuid everywhere Jaegeuk Kim
` (2 subsequent siblings)
3 siblings, 1 reply; 8+ messages in thread
From: Jaegeuk Kim @ 2020-06-15 18:08 UTC (permalink / raw)
To: linux-f2fs-devel; +Cc: Jaegeuk Kim, Rolf Eike Beer
From: Rolf Eike Beer <eb@emlix.com>
$ pkg-config --cflags blkid
-I/usr/include/blkid
The "blkid/" directory is actually part of the include path. This usually still
works because most people have the path one level up in their default include
path.
Signed-off-by: Rolf Eike Beer <eb@emlix.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
---
mkfs/f2fs_format_main.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mkfs/f2fs_format_main.c b/mkfs/f2fs_format_main.c
index 282c94e..3d86c44 100644
--- a/mkfs/f2fs_format_main.c
+++ b/mkfs/f2fs_format_main.c
@@ -23,7 +23,7 @@
#include "config.h"
#ifdef HAVE_LIBBLKID
-# include <blkid/blkid.h>
+# include <blkid.h>
#endif
#include "f2fs_fs.h"
--
2.27.0.290.gba653c62da-goog
_______________________________________________
Linux-f2fs-devel mailing list
Linux-f2fs-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
^ permalink raw reply related [flat|nested] 8+ messages in thread* [f2fs-dev] [PATCH 3/4] lib: use ${libuuid_LIBS} instead of -luuid everywhere
2020-06-15 18:08 [f2fs-dev] [PATCH 1/4] lib: fix include path for uuid.h Jaegeuk Kim
2020-06-15 18:08 ` [f2fs-dev] [PATCH 2/4] lib: fix include path for blkid.h Jaegeuk Kim
@ 2020-06-15 18:08 ` Jaegeuk Kim
2020-06-18 3:33 ` Chao Yu
2020-06-15 18:08 ` [f2fs-dev] [PATCH 4/4] lib: pass all needed include paths to libf2fs Jaegeuk Kim
2020-06-18 3:32 ` [f2fs-dev] [PATCH 1/4] lib: fix include path for uuid.h Chao Yu
3 siblings, 1 reply; 8+ messages in thread
From: Jaegeuk Kim @ 2020-06-15 18:08 UTC (permalink / raw)
To: linux-f2fs-devel; +Cc: Jaegeuk Kim, Rolf Eike Beer
From: Rolf Eike Beer <eb@emlix.com>
Otherwise linking will fail if the library is in an uncommon location or has a
non-standard name.
Signed-off-by: Rolf Eike Beer <eb@emlix.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
---
mkfs/Makefile.am | 2 +-
tools/Makefile.am | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/mkfs/Makefile.am b/mkfs/Makefile.am
index 83e2389..42c8d31 100644
--- a/mkfs/Makefile.am
+++ b/mkfs/Makefile.am
@@ -12,7 +12,7 @@ lib_LTLIBRARIES = libf2fs_format.la
libf2fs_format_la_SOURCES = f2fs_format_main.c f2fs_format.c f2fs_format_utils.c
libf2fs_format_la_CFLAGS = -DWITH_BLKDISCARD
libf2fs_format_la_CPPFLAGS = -I$(top_srcdir)/include
-libf2fs_format_la_LDFLAGS = ${libblkid_LIBS} -luuid -L$(top_builddir)/lib -lf2fs \
+libf2fs_format_la_LDFLAGS = ${libblkid_LIBS} ${libuuid_LIBS} -L$(top_builddir)/lib -lf2fs \
-version-info $(FMT_CURRENT):$(FMT_REVISION):$(FMT_AGE)
install-exec-hook:
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 446bb39..56bf2e4 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -10,7 +10,7 @@ parse_f2fs_SOURCES = f2fs_io_parse.c
if LINUX
sbin_PROGRAMS += f2fscrypt
f2fscrypt_SOURCES = f2fscrypt.c sha512.c
-f2fscrypt_LDFLAGS = -luuid
+f2fscrypt_LDFLAGS = ${libuuid_LIBS}
dist_man_MANS = f2fscrypt.8
endif
--
2.27.0.290.gba653c62da-goog
_______________________________________________
Linux-f2fs-devel mailing list
Linux-f2fs-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
^ permalink raw reply related [flat|nested] 8+ messages in thread* [f2fs-dev] [PATCH 4/4] lib: pass all needed include paths to libf2fs
2020-06-15 18:08 [f2fs-dev] [PATCH 1/4] lib: fix include path for uuid.h Jaegeuk Kim
2020-06-15 18:08 ` [f2fs-dev] [PATCH 2/4] lib: fix include path for blkid.h Jaegeuk Kim
2020-06-15 18:08 ` [f2fs-dev] [PATCH 3/4] lib: use ${libuuid_LIBS} instead of -luuid everywhere Jaegeuk Kim
@ 2020-06-15 18:08 ` Jaegeuk Kim
2020-06-18 3:33 ` Chao Yu
2020-06-18 3:32 ` [f2fs-dev] [PATCH 1/4] lib: fix include path for uuid.h Chao Yu
3 siblings, 1 reply; 8+ messages in thread
From: Jaegeuk Kim @ 2020-06-15 18:08 UTC (permalink / raw)
To: linux-f2fs-devel; +Cc: Jaegeuk Kim, Rolf Eike Beer
From: Rolf Eike Beer <eb@emlix.com>
Otherwise the paths to uuid and blkid headers extracted from pkg-config are not
respected.
Signed-off-by: Rolf Eike Beer <eb@emlix.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
---
mkfs/Makefile.am | 1 -
1 file changed, 1 deletion(-)
diff --git a/mkfs/Makefile.am b/mkfs/Makefile.am
index 42c8d31..af5b1c7 100644
--- a/mkfs/Makefile.am
+++ b/mkfs/Makefile.am
@@ -11,7 +11,6 @@ mkfs_f2fs_LDADD = ${libuuid_LIBS} ${libblkid_LIBS} $(top_builddir)/lib/libf2fs.l
lib_LTLIBRARIES = libf2fs_format.la
libf2fs_format_la_SOURCES = f2fs_format_main.c f2fs_format.c f2fs_format_utils.c
libf2fs_format_la_CFLAGS = -DWITH_BLKDISCARD
-libf2fs_format_la_CPPFLAGS = -I$(top_srcdir)/include
libf2fs_format_la_LDFLAGS = ${libblkid_LIBS} ${libuuid_LIBS} -L$(top_builddir)/lib -lf2fs \
-version-info $(FMT_CURRENT):$(FMT_REVISION):$(FMT_AGE)
--
2.27.0.290.gba653c62da-goog
_______________________________________________
Linux-f2fs-devel mailing list
Linux-f2fs-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
^ permalink raw reply related [flat|nested] 8+ messages in thread* Re: [f2fs-dev] [PATCH 1/4] lib: fix include path for uuid.h
2020-06-15 18:08 [f2fs-dev] [PATCH 1/4] lib: fix include path for uuid.h Jaegeuk Kim
` (2 preceding siblings ...)
2020-06-15 18:08 ` [f2fs-dev] [PATCH 4/4] lib: pass all needed include paths to libf2fs Jaegeuk Kim
@ 2020-06-18 3:32 ` Chao Yu
3 siblings, 0 replies; 8+ messages in thread
From: Chao Yu @ 2020-06-18 3:32 UTC (permalink / raw)
To: Jaegeuk Kim, linux-f2fs-devel; +Cc: Rolf Eike Beer
On 2020/6/16 2:08, Jaegeuk Kim wrote:
> From: Rolf Eike Beer <eb@emlix.com>
>
> $ pkg-config --cflags uuid
> -I/usr/include/uuid
>
> The "uuid/" directory is actually part of the include path. This usually still
> works because most people have the path one level up in their default include
> path.
>
> Signed-off-by: Rolf Eike Beer <eb@emlix.com>
> Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
Reviewed-by: Chao Yu <yuchao0@huawei.com>
Thanks,
_______________________________________________
Linux-f2fs-devel mailing list
Linux-f2fs-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2020-06-18 3:33 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-06-15 18:08 [f2fs-dev] [PATCH 1/4] lib: fix include path for uuid.h Jaegeuk Kim
2020-06-15 18:08 ` [f2fs-dev] [PATCH 2/4] lib: fix include path for blkid.h Jaegeuk Kim
2020-06-18 3:33 ` Chao Yu
2020-06-15 18:08 ` [f2fs-dev] [PATCH 3/4] lib: use ${libuuid_LIBS} instead of -luuid everywhere Jaegeuk Kim
2020-06-18 3:33 ` Chao Yu
2020-06-15 18:08 ` [f2fs-dev] [PATCH 4/4] lib: pass all needed include paths to libf2fs Jaegeuk Kim
2020-06-18 3:33 ` Chao Yu
2020-06-18 3:32 ` [f2fs-dev] [PATCH 1/4] lib: fix include path for uuid.h Chao Yu
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).