From cce2f497e07e426887a693744eaad8394d1b993a Mon Sep 17 00:00:00 2001 From: Theodore Ts'o Date: Sun, 1 Oct 2006 22:18:08 -0400 Subject: [PATCH] Fix Debian FTBFS problem caused by devmapper library using pthreads Addresses Debian bug: #388718 Signed-off-by: "Theodore Ts'o" --- ChangeLog | 9 +++++++++ MCONFIG.in | 5 ++++- configure | 4 ++-- configure.in | 4 ++-- debugfs/ChangeLog | 5 +++++ debugfs/Makefile.in | 2 +- e2fsck/ChangeLog | 5 +++++ e2fsck/Makefile.in | 6 +++--- misc/ChangeLog | 5 +++++ misc/Makefile.in | 2 +- 10 files changed, 37 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3aa7c4a..a970650 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2006-10-01 Theodore Tso + + * configure, configure.in: Include -lpthread if building with + devmapper support, since the latest devmapper library uses + -lpthread. (Addresses Debian bug: #388718) + + * MCONFIG.in: Define DEPLIBBLKID, DEPSTATIC_LIBBLKID, and + DEPPROFILED_LIBBLKID. + 2006-09-12 Theodore Tso * e2fsprogs.spec.in (Group): Use License tag instead of Copyright, diff --git a/MCONFIG.in b/MCONFIG.in index e8b0155..a0226f5 100644 --- a/MCONFIG.in +++ b/MCONFIG.in @@ -76,9 +76,10 @@ LIBCOM_ERR = $(LIB)/libcom_err@LIB_EXT@ LIBE2P = $(LIB)/libe2p@LIB_EXT@ LIBEXT2FS = $(LIB)/libext2fs@LIB_EXT@ LIBUUID = $(LIB)/libuuid@LIB_EXT@ @SOCKET_LIB@ -LIBBLKID = $(LIB)/libblkid@LIB_EXT@ $(DEVMAPPER_LIBS) +LIBBLKID = $(LIB)/libblkid@LIB_EXT@ LIBINTL = @LIBINTL@ DEPLIBUUID = $(LIB)/libuuid@LIB_EXT@ +DEPLIBBLKID = $(LIB)/libblkid@LIB_EXT@ STATIC_LIBSS = $(LIB)/libss@STATIC_LIB_EXT@ STATIC_LIBCOM_ERR = $(LIB)/libcom_err@STATIC_LIB_EXT@ @@ -87,6 +88,7 @@ STATIC_LIBEXT2FS = $(LIB)/libext2fs@STATIC_LIB_EXT@ STATIC_LIBUUID = $(LIB)/libuuid@STATIC_LIB_EXT@ @SOCKET_LIB@ STATIC_LIBBLKID = $(LIB)/libblkid@STATIC_LIB_EXT@ $(STATIC_DEVMAPPER_LIBS) DEPSTATIC_LIBUUID = $(LIB)/libuuid@STATIC_LIB_EXT@ +DEPSTATIC_LIBBLKID = $(LIB)/libblkid@STATIC_LIB_EXT@ PROFILED_LIBSS = $(LIB)/libss@PROFILED_LIB_EXT@ PROFILED_LIBCOM_ERR = $(LIB)/libcom_err@PROFILED_LIB_EXT@ @@ -95,6 +97,7 @@ PROFILED_LIBEXT2FS = $(LIB)/libext2fs@PROFILED_LIB_EXT@ PROFILED_LIBUUID = $(LIB)/libuuid@PROFILED_LIB_EXT@ @SOCKET_LIB@ PROFILED_LIBBLKID = $(LIB)/libblkid@PROFILED_LIB_EXT@ DEPPROFILED_LIBUUID = $(LIB)/libuuid@PROFILED_LIB_EXT@ +DEPPROFILED_LIBBLKID = $(LIB)/libblkid@PROFILED_LIB_EXT@ # An include directive pointing to a directory holding enough linux-like # include files to satisfy some programs here diff --git a/configure b/configure index bab6c73..8197c1b 100755 --- a/configure +++ b/configure @@ -3469,8 +3469,8 @@ _ACEOF DEVMAPPER_REQ='libselinux libsepol' DEVMAPPER_PC_LIBS='-ldevmapper' - DEVMAPPER_LIBS='-ldevmapper -lselinux -lsepol' - STATIC_DEVMAPPER_LIBS='/usr/lib/libdevmapper.a /usr/lib/libselinux.a /usr/lib/libsepol.a' + DEVMAPPER_LIBS='-lpthread -ldevmapper -lselinux -lsepol' + STATIC_DEVMAPPER_LIBS='-lpthread /usr/lib/libdevmapper.a /usr/lib/libselinux.a /usr/lib/libsepol.a' fi diff --git a/configure.in b/configure.in index ece81dd..44b718d 100644 --- a/configure.in +++ b/configure.in @@ -496,8 +496,8 @@ else DEVMAPPER_REQ='libselinux libsepol' DEVMAPPER_PC_LIBS='-ldevmapper' - DEVMAPPER_LIBS='-ldevmapper -lselinux -lsepol' - STATIC_DEVMAPPER_LIBS='/usr/lib/libdevmapper.a /usr/lib/libselinux.a /usr/lib/libsepol.a' + DEVMAPPER_LIBS='-lpthread -ldevmapper -lselinux -lsepol' + STATIC_DEVMAPPER_LIBS='-lpthread /usr/lib/libdevmapper.a /usr/lib/libselinux.a /usr/lib/libsepol.a' fi] , diff --git a/debugfs/ChangeLog b/debugfs/ChangeLog index 96cae61..1f8465d 100644 --- a/debugfs/ChangeLog +++ b/debugfs/ChangeLog @@ -1,3 +1,8 @@ +2006-10-01 Theodore Tso + + * Makefile.in (DEPLIBBLKID): Use DEPLIBBLKID not LIBBLKID to + define the dependencies used by the blkid library. + 2006-08-30 Eric Sandeen * htree.c (htree_dump_int_node): Fix printf formats. diff --git a/debugfs/Makefile.in b/debugfs/Makefile.in index 433f391..bdba326 100644 --- a/debugfs/Makefile.in +++ b/debugfs/Makefile.in @@ -27,7 +27,7 @@ SRCS= debug_cmds.c $(srcdir)/debugfs.c $(srcdir)/util.c $(srcdir)/ls.c \ LIBS= $(LIBEXT2FS) $(LIBE2P) $(LIBSS) $(LIBCOM_ERR) $(LIBBLKID) \ $(LIBUUID) $(DLOPEN_LIB) -DEPLIBS= $(LIBEXT2FS) $(LIBE2P) $(LIBSS) $(LIBCOM_ERR) $(LIBBLKID) $(DEPLIBUUID) +DEPLIBS= $(LIBEXT2FS) $(LIBE2P) $(LIBSS) $(LIBCOM_ERR) $(DEPLIBBLKID) $(DEPLIBUUID) .c.o: @echo " CC $<" diff --git a/e2fsck/ChangeLog b/e2fsck/ChangeLog index e87d7a8..83ad321 100644 --- a/e2fsck/ChangeLog +++ b/e2fsck/ChangeLog @@ -1,3 +1,8 @@ +2006-10-01 Theodore Tso + + * Makefile.in (DEPLIBBLKID): Use DEPLIBBLKID not LIBBLKID to + define the dependencies used by the blkid library. + 2006-08-30 Eric Sandeen * pass1.c (handle_bad_fs_blocks): use blk_t, not int for first_block. diff --git a/e2fsck/Makefile.in b/e2fsck/Makefile.in index f0b1803..95c4399 100644 --- a/e2fsck/Makefile.in +++ b/e2fsck/Makefile.in @@ -18,17 +18,17 @@ FMANPAGES= e2fsck.conf.5 XTRA_CFLAGS= -DRESOURCE_TRACK -I. LIBS= $(LIBEXT2FS) $(LIBCOM_ERR) $(LIBBLKID) $(LIBUUID) $(LIBINTL) -DEPLIBS= $(LIBEXT2FS) $(LIBCOM_ERR) $(LIBBLKID) $(DEPLIBUUID) +DEPLIBS= $(LIBEXT2FS) $(LIBCOM_ERR) $(DEPLIBBLKID) $(DEPLIBUUID) STATIC_LIBS= $(STATIC_LIBEXT2FS) $(STATIC_LIBCOM_ERR) $(STATIC_LIBBLKID) \ $(STATIC_LIBUUID) $(LIBINTL) -STATIC_DEPLIBS= $(STATIC_LIBEXT2FS) $(STATIC_LIBCOM_ERR) $(STATIC_LIBBLKID) \ +STATIC_DEPLIBS= $(STATIC_LIBEXT2FS) $(STATIC_LIBCOM_ERR) $(DEPSTATIC_LIBBLKID) \ $(DEPSTATIC_LIBUUID) PROFILED_LIBS= $(PROFILED_LIBEXT2FS) $(PROFILED_LIBCOM_ERR) \ $(PROFILED_LIBBLKID) $(PROFILED_LIBUUID) $(LIBINTL) PROFILED_DEPLIBS= $(PROFILED_LIBEXT2FS) $(PROFILED_LIBCOM_ERR) \ - $(PROFILED_LIBBLKID) $(DEPPROFILED_LIBUUID) + $(DEPPROFILED_LIBBLKID) $(DEPPROFILED_LIBUUID) COMPILE_ET=$(top_builddir)/lib/et/compile_et --build-tree diff --git a/misc/ChangeLog b/misc/ChangeLog index fc22f9d..5a21806 100644 --- a/misc/ChangeLog +++ b/misc/ChangeLog @@ -1,3 +1,8 @@ +2006-10-01 Theodore Tso + + * Makefile.in (DEPLIBBLKID): Use DEPLIBBLKID not LIBBLKID to + define the dependencies used by the blkid library. + 2006-09-29 Theodore Tso * Makefile.in: Fix makefile so that it is robust if the e2fsck diff --git a/misc/Makefile.in b/misc/Makefile.in index cd00b01..f1f67d9 100644 --- a/misc/Makefile.in +++ b/misc/Makefile.in @@ -56,7 +56,7 @@ STATIC_LIBS= $(STATIC_LIBEXT2FS) $(STATIC_LIBCOM_ERR) STATIC_DEPLIBS= $(STATIC_LIBEXT2FS) $(STATIC_LIBCOM_ERR) LIBS_BLKID= $(LIBBLKID) $(LIBUUID) -DEPLIBS_BLKID= $(LIBBLKID) $(DEPLIBUUID) +DEPLIBS_BLKID= $(DEPLIBBLKID) $(DEPLIBUUID) LIBS_E2P= $(LIBE2P) $(LIBCOM_ERR) DEPLIBS_E2P= $(LIBE2P) $(LIBCOM_ERR) -- 1.8.3.1