Whamcloud - gitweb
LU-11160 build: Fix uuid / blkid dependency 42/32842/4
authorNathaniel Clark <nathaniel.l.clark@intel.com>
Thu, 19 Jul 2018 19:26:27 +0000 (15:26 -0400)
committerOleg Drokin <green@whamcloud.com>
Mon, 6 Aug 2018 14:36:16 +0000 (14:36 +0000)
UUID dependency stems from libblkid, so only link with uuid if blkid
is present.

Signed-off-by: Nathaniel Clark <nclark@whamcloud.com>
Change-Id: If1cc293cc48210a065f8910ea655615b11268b5c
Reviewed-on: https://review.whamcloud.com/32842
Reviewed-by: Quentin Bouget <quentin.bouget@cea.fr>
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>
Tested-by: Jenkins
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: James Simmons <uja.ornl@yahoo.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>
lustre/utils/Makefile.am

index a574817..82d1c40 100644 (file)
@@ -80,14 +80,14 @@ EXT2FSLIB =
 endif
 
 if BLKID
-BLKIDLIB = -lblkid
+BLKIDLIB = -lblkid -luuid
 else
 BLKIDLIB =
 endif
 
 llverfs_LDADD := $(EXT2FSLIB) $(E2PLIB)
 
-llverdev_LDADD := $(EXT2FSLIB) $(BLKIDLIB) -luuid
+llverdev_LDADD := $(EXT2FSLIB) $(BLKIDLIB)
 
 liblustreapi_la_SOURCES = liblustreapi.c liblustreapi_hsm.c \
                          liblustreapi_nodemap.c lustreapi_internal.h \