[PATCH XFSPROGS 3/3] mkfs: Link against libuuid after liblkid

Theodore Ts'o
2011-07-21T23:50:49Z

The order in which libraries are searched matters if you are using
static libraries. Since libblkid uses some functions from libuuid, it
needs to come before libuuid in the link line.

Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
---
mkfs/Makefile | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/mkfs/Makefile b/mkfs/Makefile
index 8b61c2f..75da633 100644
--- a/mkfs/Makefile
+++ b/mkfs/Makefile
@@ -11,10 +11,6 @@ FSTYP = fstyp
HFILES = xfs_mkfs.h
CFILES = maxtrres.c proto.c xfs_mkfs.c

-LLDLIBS = $(LIBXFS) $(LIBUUID) $(LIBRT) $(LIBPTHREAD)
-LTDEPENDENCIES = $(LIBXFS)
-LLDFLAGS = -static
-
ifeq ($(ENABLE_BLKID),yes)
LLDLIBS += $(LIBBLKID)
CFLAGS += -DENABLE_BLKID
@@ -23,6 +19,9 @@ LLDLIBS += $(LIBDISK)
LTDEPENDENCIES += $(LIBDISK)
endif

+LLDLIBS += $(LIBXFS) $(LIBUUID) $(LIBRT) $(LIBPTHREAD)
+LTDEPENDENCIES += $(LIBXFS)
+LLDFLAGS = -static

LSRCFILES = $(FSTYP).c
LDIRT = $(FSTYP)
--
1.7.4.1.22.gec8e1.dirty