I can see Steve's point. I'm attaching another version of the patch that appears to remove the spurious direct dependencies. I intend to NMU this with the trivial short-term fix, though.
Ben.
--- 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/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/control
+++ e2fsprogs-1.39/debian/control
@@ -2,7 +2,7 @@
Section: admin
Priority: required
Maintainer: Theodore Y. Ts'o <[EMAIL PROTECTED]>
-Build-Depends: texi2html, gettext, texinfo, dc, libsepol1-dev,
libdevmapper-dev, libselinux1-dev, debhelper (>= 4)
+Build-Depends: texi2html, gettext, texinfo, dc, libdevmapper-dev, debhelper
(>= 4), pkg-config
Standards-Version: 3.7.2
Package: e2fsck-static
--- e2fsprogs-1.39.orig/lib/blkid/blkid.pc.in
+++ e2fsprogs-1.39/lib/blkid/blkid.pc.in
@@ -8,4 +8,4 @@
Version: @E2FSPROGS_VERSION@
-Requires: uuid @DEVMAPPER_REQ@
+Requires.private: uuid @DEVMAPPER_REQ@
Cflags: -I${includedir}
-Libs: -L${libdir} -lblkid @DEVMAPPER_PC_LIBS@
+Libs: -L${libdir} -lblkid
--- e2fsprogs-1.39.orig/MCONFIG.in
+++ e2fsprogs-1.39/MCONFIG.in
@@ -75,10 +75,11 @@
LIBCOM_ERR = $(LIB)/[EMAIL PROTECTED]@
LIBE2P = $(LIB)/[EMAIL PROTECTED]@
LIBEXT2FS = $(LIB)/[EMAIL PROTECTED]@
-LIBUUID = $(LIB)/[EMAIL PROTECTED]@ @SOCKET_LIB@
-LIBBLKID = $(LIB)/[EMAIL PROTECTED]@ $(DEVMAPPER_LIBS)
+LIBUUID = $(LIB)/[EMAIL PROTECTED]@
+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,14 +88,16 @@
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]@
PROFILED_LIBE2P = $(LIB)/[EMAIL PROTECTED]@
PROFILED_LIBEXT2FS = $(LIB)/[EMAIL PROTECTED]@
-PROFILED_LIBUUID = $(LIB)/[EMAIL PROTECTED]@ @SOCKET_LIB@
+PROFILED_LIBUUID = $(LIB)/[EMAIL PROTECTED]@
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
@@ -494,17 +494,15 @@
AC_DEFINE(HAVE_DEVMAPPER)
echo "Enabling device-mapper support"
- 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_REQ='devmapper'
+ DEVMAPPER_LIBS="$(pkg-config --libs devmapper)"
+ STATIC_DEVMAPPER_LIBS="$(pkg-config --libs --static devmapper)"
fi]
,
echo "Disabling device-mapper support by default"
)
AC_SUBST(DEVMAPPER_REQ)
-AC_SUBST(DEVMAPPER_PC_LIBS)
AC_SUBST(DEVMAPPER_LIBS)
AC_SUBST(STATIC_DEVMAPPER_LIBS)
dnl
-- 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
