On Tue, May 12, 2009 at 06:45:51PM +0200, Olaf wrote:
> Jürg Billeter wrote:
>> On Mon, 2009-05-11 at 13:43 +0200, Kay Sievers wrote:
>>
>>> On Mon, May 11, 2009 at 12:23, Karel Zak <kzak@xxxxxxxxxx> wrote:
>>>
>>>> yes, you need
>>>>
>>>> util-linux-ng 2.15 --with-fsprobe=builtin
>>>> e2fsprogs 1.41.5 --disable-libblkid
>>>>
>>> Sounds good.
>>>
>>> It's all a bit of inconvenient at the moment with the
>>> inter-dependencies, but it's great that we will all end up finally
>>> with only a single filesystem-probing lib.
>>>
>>
>> Maybe I'm missing something, but doesn't this introduce a circular
>> dependency?
>>
>> e2fsprogs depends on util-linux-ng if built with --disable-libblkid
>> util-linux-ng depends on e2fsprog for libuuid
>>
>> If I'm not misunderstanding anything, are there plans to fix this?
>> Maybe libuuid should be moved to a separate package.
I'd like to move libuuid also to util-linux-ng. The library is really
not e2fs-specific and a lot of packages depend on the library. For
example Fedora 10:
$ repoquery --whatrequires libuuid* --queryformat="%{NAME}" | sort -u | wc -l
61
Ted, any opinion?
> Building util-linux-ng 2.15 using --with-fsprobe=builtin, without having
> previously built e2fsprogs, gives me:
[...]
> read.c:28:23: error: uuid/uuid.h: No such file or directory
> make[3]: *** [read.lo] Error 1
> make[3]: *** Waiting for unfinished jobs....
Thanks for your report. Fixed (see below).
The libuuid should be optional for u-l-ng. BUT it's recommended to
link mkswap against libuuid, so after e2fsprogs installation you can
rebuild and reinstall util-linux-ng. For example for RPM it's not a
problem when A depends on B and B on A. (I hope:-)
Karel
>From cdd17c7a73cab10a34bf80616225b8215ac4e2ed Mon Sep 17 00:00:00 2001
From: Karel Zak <kzak@xxxxxxxxxx>
Date: Tue, 12 May 2009 21:22:19 +0200
Subject: [PATCH] blkid: make libuuid optional
read.c:28:23: error: uuid/uuid.h: No such file or directory
make[3]: *** [read.lo] Error 1
make[3]: *** Waiting for unfinished jobs....
Reported-by: Olaf <mailinglists@xxxxxxxxxxxx>
Signed-off-by: Karel Zak <kzak@xxxxxxxxxx>
---
libs/blkid/src/config.c | 3 ---
libs/blkid/src/evaluate.c | 3 ---
libs/blkid/src/read.c | 1 -
3 files changed, 0 insertions(+), 7 deletions(-)
diff --git a/libs/blkid/src/config.c b/libs/blkid/src/config.c
index 2e59218..9091736 100644
--- a/libs/blkid/src/config.c
+++ b/libs/blkid/src/config.c
@@ -24,9 +24,6 @@
#include <errno.h>
#endif
#include <stdint.h>
-#ifdef HAVE_LIBUUID
-#include <uuid/uuid.h>
-#endif
#include <stdarg.h>
#include "blkdev.h"
diff --git a/libs/blkid/src/evaluate.c b/libs/blkid/src/evaluate.c
index a9c9fba..f0ae126 100644
--- a/libs/blkid/src/evaluate.c
+++ b/libs/blkid/src/evaluate.c
@@ -27,9 +27,6 @@
#include <errno.h>
#endif
#include <stdint.h>
-#ifdef HAVE_LIBUUID
-#include <uuid/uuid.h>
-#endif
#include <stdarg.h>
#include "pathnames.h"
diff --git a/libs/blkid/src/read.c b/libs/blkid/src/read.c
index 4163874..b5e9cd0 100644
--- a/libs/blkid/src/read.c
+++ b/libs/blkid/src/read.c
@@ -25,7 +25,6 @@
#endif
#include "blkidP.h"
-#include "uuid/uuid.h"
#ifdef HAVE_STRTOULL
#define STRTOULL strtoull /* defined in stdlib.h if you try hard enough */
--
1.6.0.6
--
To unsubscribe from this list: send the line "unsubscribe util-linux-ng" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
