package/btrfs-progs/0001-Makefile.in-install-static-library-and-headers-in-in.patch

   1 From 2c2c2d992c3b298793983317588f73cf41675652 Mon Sep 17 00:00:00 2001
   2 From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
   3 Date: Wed, 27 Jul 2016 22:49:58 +0200
   4 Subject: [PATCH] Makefile.in: install static library and headers in
   5  install-static
   6
   7 Currently, the install-static target only installs the statically
   8 compiled tools. However, some programs outside of btrfs-progs (for
   9 example docker) link with the btrfs libraries. If such programs want
  10 to link statically against the btrfs-progs library, then this library
  11 should be installed by "install-static". Indeed, "make install" cannot
  12 be used if the support for shared library is not enabled.
  13
  14 Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
  15 [Gustavo: Rebase for btrfs-progs 4.7.2]
  16 Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
  17 ---
  18  Makefile.in | 6 +++++-
  19  1 file changed, 5 insertions(+), 1 deletion(-)
  20
  21 diff --git a/Makefile.in b/Makefile.in
  22 index 19697ff..5870a58 100644
  23 --- a/Makefile.in
  24 +++ b/Makefile.in
  25 @@ -219,7 +219,7 @@ test: test-fsck test-mkfs test-convert test-misc test-fuzz
  26  # NOTE: For static compiles, you need to have all the required libs
  27  #      static equivalent available
  28  #
  29 -static: $(progs_static)
  30 +static: $(progs_static) $(libs_static)
  31
  32  version.h: version.sh version.h.in configure.ac
  33         @echo "    [SH]     $@"
  34 @@ -384,6 +384,10 @@ install-static: $(progs_static) $(INSTALLDIRS)
  35         done
  36         # btrfsck is a link to btrfs in the src tree, make it so for installed file as well
  37         $(LN_S) -f btrfs.static $(DESTDIR)$(bindir)/btrfsck.static
  38 +       $(INSTALL) -m755 -d $(DESTDIR)$(libdir)
  39 +       $(INSTALL) $(libs_static) $(DESTDIR)$(libdir)
  40 +       $(INSTALL) -m755 -d $(DESTDIR)$(incdir)
  41 +       $(INSTALL) -m644 $(headers) $(DESTDIR)$(incdir)
  42
  43  $(INSTALLDIRS):
  44         @echo "Making install in $(patsubst install-%,%,$@)"
  45 --
  46 2.7.3
  47