libdiskfs: build system inconsistencies; the Hurd `collecting box'

[Thomas Schwinge]

Hi!

libdiskfs #includes pager.h (libpager).  If pager is not contained in
HURDLIBS, then the system-wide file from /include will be used and not
the one from the currently-being-built Hurd tree.  That won't be an issue
if both of them adhere to the same API, which they didn't for me, as I
was building a pre-ogi ext2fs, but the system had the usual Debian
GNU/Hurd ext2fs installed, containing Ognyan's API changes.

I'd suggest to go for one of the two following possibilities: either we
implement a reliable mechanism that makes the Hurd's build system not use
the system-wide header files (how to do that; only for the Hurd's own
header files, but not for glibc, etc.) or we split the whole Hurd package
into small packages--libpager, libdiskfs, libstore, libihash, ...,
ext2fs, ...--that _only_ use the system-wide header files (many packages;
how to combine them reasonably).

What do you think?


libdiskfs/
2006-02-07  Thomas Schwinge  <tschwinge@gnu.org>

        * Makefile (HURDLIBS): Add `pager'.

Index: Makefile
===================================================================
RCS file: /cvsroot/hurd/hurd/libdiskfs/Makefile,v
retrieving revision 1.71
diff -u -r1.71 Makefile
--- Makefile    27 Jun 2002 19:19:13 -0000      1.71
+++ Makefile    7 Feb 2006 10:15:40 -0000
@@ -1,5 +1,5 @@
 #
-#   Copyright (C) 1994,95,96,97,98,99,2000,01 Free Software Foundation, Inc.
+#   Copyright (C) 1994,95,96,97,98,99,2000,01,06 Free Software Foundation, Inc.
 #
 #   This program is free software; you can redistribute it and/or
 #   modify it under the terms of the GNU General Public License as
@@ -61,7 +61,7 @@
        startup_notifyServer.o
 OBJS = $(sort $(SRCS:.c=.o) $(MIGSTUBS))
 
-HURDLIBS = fshelp iohelp store threads ports shouldbeinlibc
+HURDLIBS = fshelp iohelp store threads ports shouldbeinlibc pager
 
 fsys-MIGSFLAGS = -imacros $(srcdir)/fsmutations.h -DREPLY_PORTS
 fs-MIGSFLAGS = -imacros $(srcdir)/fsmutations.h

Okay to apply?


Regards,
 Thomas