You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

79 lines
2.4 KiB

  1. Index: btrfs-progs-v3.19.1/mkfs.c
  2. ===================================================================
  3. --- btrfs-progs-v3.19.1.orig/mkfs.c
  4. +++ btrfs-progs-v3.19.1/mkfs.c
  5. @@ -31,7 +31,7 @@
  6. #include <getopt.h>
  7. #include <uuid/uuid.h>
  8. #include <ctype.h>
  9. -#include <sys/xattr.h>
  10. +#include <attr/xattr.h>
  11. #include <limits.h>
  12. #include <linux/limits.h>
  13. #include <blkid/blkid.h>
  14. Index: btrfs-progs-v3.19.1/props.c
  15. ===================================================================
  16. --- btrfs-progs-v3.19.1.orig/props.c
  17. +++ btrfs-progs-v3.19.1/props.c
  18. @@ -17,7 +17,7 @@
  19. #include <sys/stat.h>
  20. #include <sys/ioctl.h>
  21. #include <sys/types.h>
  22. -#include <sys/xattr.h>
  23. +#include <attr/xattr.h>
  24. #include <fcntl.h>
  25. #include <unistd.h>
  26. Index: btrfs-progs-v3.19.1/cmds-receive.c
  27. ===================================================================
  28. --- btrfs-progs-v3.19.1.orig/cmds-receive.c
  29. +++ btrfs-progs-v3.19.1/cmds-receive.c
  30. @@ -34,7 +34,7 @@
  31. #include <sys/ioctl.h>
  32. #include <sys/time.h>
  33. #include <sys/types.h>
  34. -#include <sys/xattr.h>
  35. +#include <attr/xattr.h>
  36. #include <uuid/uuid.h>
  37. #include "ctree.h"
  38. Index: btrfs-progs-v3.19.1/cmds-restore.c
  39. ===================================================================
  40. --- btrfs-progs-v3.19.1.orig/cmds-restore.c
  41. +++ btrfs-progs-v3.19.1/cmds-restore.c
  42. @@ -32,7 +32,7 @@
  43. #include <regex.h>
  44. #include <getopt.h>
  45. #include <sys/types.h>
  46. -#include <sys/xattr.h>
  47. +#include <attr/xattr.h>
  48. #include "ctree.h"
  49. #include "disk-io.h"
  50. Index: btrfs-progs-v3.19.1/Makefile.in
  51. ===================================================================
  52. --- btrfs-progs-v3.19.1.orig/Makefile.in
  53. +++ btrfs-progs-v3.19.1/Makefile.in
  54. @@ -21,7 +21,7 @@ CFLAGS = @CFLAGS@ \
  55. LDFLAGS = @LDFLAGS@ \
  56. -rdynamic
  57. -LIBS = @UUID_LIBS@ @BLKID_LIBS@ @ZLIB_LIBS@ @LZO2_LIBS@ -L. -pthread
  58. +LIBS = @ATTR_LIBS@ @UUID_LIBS@ @BLKID_LIBS@ @ZLIB_LIBS@ @LZO2_LIBS@ -L. -pthread
  59. LIBBTRFS_LIBS = $(LIBS)
  60. # Static compilation flags
  61. Index: btrfs-progs-v3.19.1/configure.ac
  62. ===================================================================
  63. --- btrfs-progs-v3.19.1.orig/configure.ac
  64. +++ btrfs-progs-v3.19.1/configure.ac
  65. @@ -115,6 +115,9 @@ dnl
  66. dnl The default PKG_CHECK_MODULES() action-if-not-found is end the
  67. dnl execution with error. The static libs are optional.
  68. +PKG_CHECK_MODULES(ATTR, [libattr])
  69. +PKG_STATIC(BLKID_LIBS_STATIC, [libattr])
  70. +
  71. PKG_CHECK_MODULES(BLKID, [blkid])
  72. PKG_STATIC(BLKID_LIBS_STATIC, [blkid])