From: Theodore Ts'o <tytso@mit.edu>
Date: Thu, 21 Jul 2011 23:50:37 +0000 (-0400)
Subject: mkfs: link against libuuid after liblkid
X-Git-Tag: v3.1.6~39
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2fb5b620d7723c3d0646860172399c9a182151b1;p=thirdparty%2Fxfsprogs-dev.git

mkfs: link against libuuid after liblkid

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>
Signed-off-by: Christoph Hellwig <hch@lst.de>
---

diff --git a/mkfs/Makefile b/mkfs/Makefile
index 8b61c2fe8..75da6335b 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)