From: Nathan Scott <nathans@sgi.com>
Date: Sun, 15 Jul 2001 04:32:35 +0000 (+0000)
Subject: fix liblvm linking problem due to libdisk code reorg.  see comment in
X-Git-Tag: v2.0.0~97
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=04730b9a7f999089415b8e3ca55d9bde8f57abe4;p=thirdparty%2Fxfsprogs-dev.git

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 5f7761a70..527fc471c 100644
--- 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