fix liblvm linking problem due to libdisk code reorg. see comment in

Makefile for more details.

diff --git a/mkfs/Makefile b/mkfs/Makefile
index 5f7761a7054ff4bb62965ccf23ec8ea2bb289ddf..527fc471cce82aaf7bafe8d4e90cf997e067f861 100644 (file)
--- a/mkfs/Makefile
+++ b/mkfs/Makefile
@@ -39,7 +39,11 @@ FSTYP = fstyp
 
 HFILES = xfs_mkfs.h proto.h
 CFILES = $(HFILES:.h=.c)
-LLDLIBS = $(LIBXFS) $(LIBDISK) $(LIBUUID) $(LIBLVM)
+
+# Note: ordering for libdisk and liblvm is important - we must
+# now present liblvm to ld twice :( -> libdisk works around the
+# liblvm unresolved symbol problem, but also calls into liblvm.
+LLDLIBS = $(LIBXFS) $(LIBUUID) $(LIBLVM) $(LIBDISK) $(LIBLVM)
 LTDEPENDENCIES = $(LIBXFS) $(LIBDISK)
 LLDFLAGS = -static