X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=xfsprogs-miscfix-v2.patch;h=20d8f10bb0e830a25cd53e51adb4ac14e8dc85b6;hb=bcc8f09ef87d4bae30d1fc1db2d24e95753679ae;hp=a47d926d4105716360fa75ba3becbf65c955931a;hpb=528ce8b7118c3624c674236e67db750f976deca8;p=packages%2Fxfsprogs.git diff --git a/xfsprogs-miscfix-v2.patch b/xfsprogs-miscfix-v2.patch index a47d926..20d8f10 100644 --- a/xfsprogs-miscfix-v2.patch +++ b/xfsprogs-miscfix-v2.patch @@ -14,18 +14,14 @@ AC_SUBST(have_zipped_manpages) ]) ---- xfsprogs-3.1.3/Makefile~ 2010-08-18 06:54:06.000000000 +0200 -+++ xfsprogs-3.1.3/Makefile 2010-08-28 16:35:25.820731669 +0200 -@@ -39,7 +39,11 @@ - LDIRT += $(SRCTAR) - endif +--- xfsprogs-3.2.0/libxfs/Makefile~ 2014-01-28 07:19:44.000000000 +0100 ++++ xfsprogs-3.2.0/libxfs/Makefile 2014-05-17 20:01:36.257560519 +0200 +@@ -56,7 +56,7 @@ --LIB_SUBDIRS = libxfs libxlog libxcmd libhandle libdisk -+LIB_SUBDIRS = libxfs libxlog libxcmd libhandle -+ifneq ($(ENABLE_BLKID), yes) -+LIB_SUBDIRS += libdisk -+endif -+ - TOOL_SUBDIRS = copy db estimate fsck fsr growfs io logprint mkfs quota \ - mdrestore repair rtcp m4 man doc po debian + FCFLAGS = -I. +-LTLIBS = $(LIBPTHREAD) $(LIBRT) ++LTLIBS = $(LIBPTHREAD) $(LIBRT) $(LIBUUID) + + # don't try linking xfs_repair with a debug libxfs. + DEBUG = -DNDEBUG