0003-btrfs.static-needs-libbtrfsutil.patch 1.4 KB

123456789101112131415161718192021222324252627282930313233343536373839
  1. From 5023fdf9a4524106ef6fe1d0fdd75ade16dec62c Mon Sep 17 00:00:00 2001
  2. From: Baruch Siach <baruch@tkos.co.il>
  3. Date: Tue, 10 Apr 2018 22:56:31 +0300
  4. Subject: [PATCH] btrfs.static: needs libbtrfsutil
  5. Add libbtrfsutil objects to btrfs.static link command. This fixes static
  6. build failure:
  7. utils.static.o: In function `parse_qgroupid':
  8. utils.c:(.text.parse_qgroupid+0xb0): undefined reference to `btrfs_util_is_subvolume'
  9. props.static.o: In function `prop_read_only':
  10. props.c:(.text.prop_read_only+0x70): undefined reference to `btrfs_util_set_subvolume_read_only'
  11. ...
  12. Makefile:457: recipe for target 'btrfs.static' failed
  13. make[1]: *** [btrfs.static] Error 1
  14. Signed-off-by: Baruch Siach <baruch@tkos.co.il>
  15. ---
  16. Upstream status: https://patchwork.kernel.org/patch/10333795/
  17. Makefile | 2 +-
  18. 1 file changed, 1 insertion(+), 1 deletion(-)
  19. diff --git a/Makefile b/Makefile
  20. index 5ba76d2eee40..9b97c36a44a5 100644
  21. --- a/Makefile
  22. +++ b/Makefile
  23. @@ -453,7 +453,7 @@ btrfs: btrfs.o $(objects) $(cmds_objects) $(libs_static)
  24. @echo " [LD] $@"
  25. $(Q)$(CC) -o $@ $^ $(LDFLAGS) $(LIBS) $(LIBS_COMP)
  26. -btrfs.static: btrfs.static.o $(static_objects) $(static_cmds_objects) $(static_libbtrfs_objects)
  27. +btrfs.static: btrfs.static.o $(static_objects) $(static_cmds_objects) $(static_libbtrfs_objects) $(libbtrfsutil_objects)
  28. @echo " [LD] $@"
  29. $(Q)$(CC) -o $@ $^ $(STATIC_LDFLAGS) $(STATIC_LIBS) $(STATIC_LIBS_COMP)
  30. --
  31. 2.16.3