xfs
[Top] [All Lists]

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

To: Ext4 Developers List <linux-ext4@xxxxxxxxxxxxxxx>, xfs@xxxxxxxxxxx
Subject: [PATCH XFSPROGS 3/3] mkfs: Link against libuuid after liblkid
From: "Theodore Ts'o" <tytso@xxxxxxx>
Date: Thu, 21 Jul 2011 19:50:37 -0400
Cc: "Theodore Ts'o" <tytso@xxxxxxx>
In-reply-to: <1311292237-4155-1-git-send-email-tytso@xxxxxxx>
References: <1311292237-4155-1-git-send-email-tytso@xxxxxxx>
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@xxxxxxx>
---
 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

<Prev in Thread] Current Thread [Next in Thread>