- rel 2

[packages/xfsprogs.git] / xfsprogs-miscfix-v2.patch

diff --git a/xfsprogs-miscfix-v2.patch b/xfsprogs-miscfix-v2.patch
index 8e470b9579f4ded34bb155be5f52211747458a6f..dc1c2eef2a6902146590f3166f7402e836fcda4e 100644 (file)
--- a/xfsprogs-miscfix-v2.patch
+++ b/xfsprogs-miscfix-v2.patch
@@ -14,3 +14,30 @@
      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
+ 
+-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
+ 
+
+--- 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 @@
+ 
+ FCFLAGS = -I.
+ 
+-LTLIBS = $(LIBPTHREAD) $(LIBRT)
++LTLIBS = $(LIBPTHREAD) $(LIBRT) $(LIBUUID)
+ 
+ # don't try linking xfs_repair with a debug libxfs.
+ DEBUG = -DNDEBUG