From c088105ae22a3d5e8b26f6aee84a9dae3750380e Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Mon, 8 Dec 2014 07:22:29 +0100 Subject: [PATCH] btrfs-progs: fix libattr linking and dependency Signed-off-by: Daniel Golle --- utils/btrfs-progs/Makefile | 2 +- .../patches/001-fix-xattr-h-include-location.patch | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/utils/btrfs-progs/Makefile b/utils/btrfs-progs/Makefile index ca7bbc061..2ea81a1b4 100644 --- a/utils/btrfs-progs/Makefile +++ b/utils/btrfs-progs/Makefile @@ -29,7 +29,7 @@ define Package/btrfs-progs SECTION:=utils CATEGORY:=Utilities SUBMENU:=Filesystem - DEPENDS:=+attr +libuuid +zlib +libext2fs +libblkid +liblzo +libpthread + DEPENDS:=+libattr +libuuid +zlib +libext2fs +libblkid +liblzo +libpthread TITLE:=Btrfs filesystems utilities URL:=http://btrfs.wiki.kernel.org/ endef diff --git a/utils/btrfs-progs/patches/001-fix-xattr-h-include-location.patch b/utils/btrfs-progs/patches/001-fix-xattr-h-include-location.patch index 68bbbfc7f..0e3216952 100644 --- a/utils/btrfs-progs/patches/001-fix-xattr-h-include-location.patch +++ b/utils/btrfs-progs/patches/001-fix-xattr-h-include-location.patch @@ -42,3 +42,14 @@ #include "ctree.h" #include "disk-io.h" +--- a/Makefile ++++ b/Makefile +@@ -26,7 +26,7 @@ TESTS = fsck-tests.sh convert-tests.sh + INSTALL = install + prefix ?= /usr/local + bindir = $(prefix)/bin +-lib_LIBS = -luuid -lblkid -lm -lz -llzo2 -L. ++lib_LIBS = -lattr -luuid -lblkid -lm -lz -llzo2 -L. + libdir ?= $(prefix)/lib + incdir = $(prefix)/include/btrfs + LIBS = $(lib_LIBS) $(libs_static)