From: Nathaniel Clark <nathaniel.l.clark@intel.com>
Date: Thu, 19 Jul 2018 19:26:27 +0000 (-0400)
Subject: LU-11160 build: Fix uuid / blkid dependency
X-Git-Tag: 2.10.6-RC1~1
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=c4116b86130a4bffacb145f4eedbd2ed6a567495;p=fs%2Flustre-release.git

LU-11160 build: Fix uuid / blkid dependency

UUID dependency stems from libblkid, so only link with uuid if blkid
is present.

Lustre-change: https://review.whamcloud.com/32842
Lustre-commit: b6c2ffa661f5aceb50fe03fbc8cfd7cdf7966ae2

Signed-off-by: Nathaniel Clark <nclark@whamcloud.com>
Change-Id: If1cc293cc48210a065f8910ea655615b11268b5c
Reviewed-by: Quentin Bouget <quentin.bouget@cea.fr>
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>
Reviewed-by: James Simmons <uja.ornl@yahoo.com>
Signed-off-by: Minh Diep <mdiep@whamcloud.com>
Reviewed-on: https://review.whamcloud.com/33147
Tested-by: Jenkins
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: John L. Hammond <jhammond@whamcloud.com>
---

diff --git a/lustre/utils/Makefile.am b/lustre/utils/Makefile.am
index 0e16b65..e8f2673 100644
--- a/lustre/utils/Makefile.am
+++ b/lustre/utils/Makefile.am
@@ -80,7 +80,7 @@ EXT2FSLIB =
 endif
 
 if BLKID
-BLKIDLIB = -lblkid
+BLKIDLIB = -lblkid -luuid
 else
 BLKIDLIB =
 endif