The patch I've actually applied now:
--- e2fsprogs-1.39.orig/debugfs/Makefile.in
+++ e2fsprogs-1.39/debugfs/Makefile.in
@@ -27,7 +27,7 @@
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 $<"
--- e2fsprogs-1.39.orig/e2fsck/Makefile.in
+++ e2fsprogs-1.39/e2fsck/Makefile.in
@@ -18,17 +18,17 @@
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
--- e2fsprogs-1.39.orig/configure
+++ e2fsprogs-1.39/configure
@@ -3469,8 +3469,8 @@
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='-pthread -ldevmapper -lselinux -lsepol'
+ STATIC_DEVMAPPER_LIBS='-pthread /usr/lib/libdevmapper.a
/usr/lib/libselinux.a /usr/lib/libsepol.a'
fi
--- e2fsprogs-1.39.orig/misc/Makefile.in
+++ e2fsprogs-1.39/misc/Makefile.in
@@ -55,7 +55,7 @@
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)
--- e2fsprogs-1.39.orig/debian/changelog
+++ e2fsprogs-1.39/debian/changelog
@@ -1,3 +1,10 @@
+e2fsprogs (1.39-1.1) unstable; urgency=low
+
+ * Non-maintainer upload
+ * Added -pthreads to devmapper libraries (Closes: #388718)
+
+ -- Ben Hutchings <[EMAIL PROTECTED]> Sat, 30 Sep 2006 12:49:47 +0100
+
e2fsprogs (1.39-1) unstable; urgency=low
* New upstream version
--- e2fsprogs-1.39.orig/MCONFIG.in
+++ e2fsprogs-1.39/MCONFIG.in
@@ -76,9 +76,10 @@
LIBE2P = $(LIB)/[EMAIL PROTECTED]@
LIBEXT2FS = $(LIB)/[EMAIL PROTECTED]@
LIBUUID = $(LIB)/[EMAIL PROTECTED]@ @SOCKET_LIB@
-LIBBLKID = $(LIB)/[EMAIL PROTECTED]@ $(DEVMAPPER_LIBS)
+LIBBLKID = $(LIB)/[EMAIL PROTECTED]@
LIBINTL = @LIBINTL@
DEPLIBUUID = $(LIB)/[EMAIL PROTECTED]@
+DEPLIBBLKID = $(LIB)/[EMAIL PROTECTED]@
STATIC_LIBSS = $(LIB)/[EMAIL PROTECTED]@
STATIC_LIBCOM_ERR = $(LIB)/[EMAIL PROTECTED]@
@@ -87,6 +88,7 @@
STATIC_LIBUUID = $(LIB)/[EMAIL PROTECTED]@ @SOCKET_LIB@
STATIC_LIBBLKID = $(LIB)/[EMAIL PROTECTED]@ $(STATIC_DEVMAPPER_LIBS)
DEPSTATIC_LIBUUID = $(LIB)/[EMAIL PROTECTED]@
+DEPSTATIC_LIBBLKID = $(LIB)/[EMAIL PROTECTED]@
PROFILED_LIBSS = $(LIB)/[EMAIL PROTECTED]@
PROFILED_LIBCOM_ERR = $(LIB)/[EMAIL PROTECTED]@
@@ -95,6 +97,7 @@
PROFILED_LIBUUID = $(LIB)/[EMAIL PROTECTED]@ @SOCKET_LIB@
PROFILED_LIBBLKID = $(LIB)/[EMAIL PROTECTED]@
DEPPROFILED_LIBUUID = $(LIB)/[EMAIL PROTECTED]@
+DEPPROFILED_LIBBLKID = $(LIB)/[EMAIL PROTECTED]@
# An include directive pointing to a directory holding enough linux-like
# include files to satisfy some programs here
--- e2fsprogs-1.39.orig/configure.in
+++ e2fsprogs-1.39/configure.in
@@ -496,8 +496,8 @@
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='-pthread -ldevmapper -lselinux -lsepol'
+ STATIC_DEVMAPPER_LIBS='-pthread /usr/lib/libdevmapper.a
/usr/lib/libselinux.a /usr/lib/libsepol.a'
fi]
,
-- END ---- Ben Hutchings -- [EMAIL PROTECTED] shortened to [EMAIL PROTECTED] If you've signed my GPG key, please send a signature on and to the new uid. Tomorrow will be cancelled due to lack of interest.
signature.asc
Description: This is a digitally signed message part
