I think vim <esc>wq turned into <esc>2wq or something; in any case
blkid_probe_get_topology2 is not the right thing to search for.
Signed-off-by: Eric Sandeen <[email protected]>
---
(note; with this, once I try to build w/ a new libblkid, I still
get a mkfs build error ... it's still picking up the in-tree blkid
headers)
diff --git a/configure.in b/configure.in
index c278d83..cd2c246 100644
--- a/configure.in
+++ b/configure.in
@@ -809,7 +809,7 @@ if test -n "$BLKID_CMT"; then
AC_SEARCH_LIBS([blkid_probe_all], [blkid])
fi
dnl
-AC_CHECK_FUNCS(chflags getrusage llseek lseek64 open64 fstat64 ftruncate64 getmntinfo strtoull strcasecmp srandom jrand48 fchown mallinfo fdatasync strnlen strptime strdup sysconf pathconf posix_memalign memalign valloc __secure_getenv prctl mmap utime setresuid setresgid usleep nanosleep getdtablesize getrlimit sync_file_range posix_fadvise fallocate blkid_probe_get_topology2)
+AC_CHECK_FUNCS(chflags getrusage llseek lseek64 open64 fstat64 ftruncate64 getmntinfo strtoull strcasecmp srandom jrand48 fchown mallinfo fdatasync strnlen strptime strdup sysconf pathconf posix_memalign memalign valloc __secure_getenv prctl mmap utime setresuid setresgid usleep nanosleep getdtablesize getrlimit sync_file_range posix_fadvise fallocate blkid_probe_get_topology)
dnl
dnl Check to see if -lsocket is required (solaris) to make something
dnl that uses socket() to compile; this is needed for the UUID library
On Tue, Oct 20, 2009 at 10:48:07PM -0500, Eric Sandeen wrote:
> I think vim <esc>wq turned into <esc>2wq or something; in any case
> blkid_probe_get_topology2 is not the right thing to search for.
>
> Signed-off-by: Eric Sandeen <[email protected]>
Applied, thanks.
- Ted
> (note; with this, once I try to build w/ a new libblkid, I still
> get a mkfs build error ... it's still picking up the in-tree blkid
> headers)
Hmmm... which in-tree header files is it picking up? And what error
are you seeing?
There are a few header files that I can see that we should probably
clean-up, but they don't look like they should be problematic.
build.static/lib/blkid/blkid_types.h -- just simple type definitions
lib/blkid/blkidP.h --- only used by lib/blkid/*.c
lib/blkid/list.h --- only used by lib/blkid/*.c
lib/blkid/probe.h -- only used by lib/blkid/probe.c
Theodore Tso wrote:
>> (note; with this, once I try to build w/ a new libblkid, I still
>> get a mkfs build error ... it's still picking up the in-tree blkid
>> headers)
>
> Hmmm... which in-tree header files is it picking up? And what error
> are you seeing?
>
> There are a few header files that I can see that we should probably
> clean-up, but they don't look like they should be problematic.
>
> build.static/lib/blkid/blkid_types.h -- just simple type definitions
> lib/blkid/blkidP.h --- only used by lib/blkid/*.c
> lib/blkid/list.h --- only used by lib/blkid/*.c
> lib/blkid/probe.h -- only used by lib/blkid/probe.c
making all in misc
make[2]: Entering directory `/src/git/e2fsprogs/misc'
gcc -c -I../lib -I../lib \
<snip> \
-g -O2 -I./../e2fsck -I. mke2fs.c -o mke2fs.o
mke2fs.c: In function ?ext2fs_get_device_geometry?:
mke2fs.c:1033: error: ?blkid_probe? undeclared (first use in this function)
mke2fs.c:1033: error: (Each undeclared identifier is reported only once
mke2fs.c:1033: error: for each function it appears in.)
mke2fs.c:1033: error: expected ?;? before ?pr?
mke2fs.c:1034: error: ?blkid_topology? undeclared (first use in this
function)
mke2fs.c:1034: error: expected ?;? before ?tp?
mke2fs.c:1038: error: ?pr? undeclared (first use in this function)
mke2fs.c:1042: error: ?tp? undeclared (first use in this function)
make[2]: *** [mke2fs.o] Error 1
make[2]: Leaving directory `/src/git/e2fsprogs/misc'
make[1]: *** [all-progs-recursive] Error 1
make[1]: Leaving directory `/src/git/e2fsprogs'
make: *** [all] Error 2
seems like it's not picking up the system /usr/include/blkid/blkid.h but
rather e2fsprogs/lib/blkid/blkid.h
-Eric
On Wed, Oct 21, 2009 at 10:21:53AM -0500, Eric Sandeen wrote:
>
> seems like it's not picking up the system /usr/include/blkid/blkid.h but
> rather e2fsprogs/lib/blkid/blkid.h
>
Um, in the maint branch e2fsprogs/lib/blkid/blkid.h no longer exists
in the Git tree. It's been renamed to e2fsprogs/lib/blkid/blkid.h.in,
and blkid.h is only built if libblkid is enabled.
Perhaps you have a stale file that wasn't deleted by git?
- Ted
Theodore Tso wrote:
> On Wed, Oct 21, 2009 at 10:21:53AM -0500, Eric Sandeen wrote:
>> seems like it's not picking up the system /usr/include/blkid/blkid.h but
>> rather e2fsprogs/lib/blkid/blkid.h
>>
>
> Um, in the maint branch e2fsprogs/lib/blkid/blkid.h no longer exists
> in the Git tree. It's been renamed to e2fsprogs/lib/blkid/blkid.h.in,
> and blkid.h is only built if libblkid is enabled.
>
> Perhaps you have a stale file that wasn't deleted by git?
>
> - Ted
oh dear, maybe that's it :)
Ok, on a fresh checkout it worked...
Sorry, not sure what state I got things into.
Thanks,
-Eric
On Wed, Oct 21, 2009 at 05:14:17PM -0500, Eric Sandeen wrote:
> oh dear, maybe that's it :)
>
> Ok, on a fresh checkout it worked...
>
> Sorry, not sure what state I got things into.
Git status should have shown the "extra" file; I make a practice of
using "git status" often to make sure there aren't any files I forgot
to check in, or anything other unexpected discrepancies between the
head of the git tree and the working directory.
- Ted