From 9a03f6d41f8e6b3312dc0c87563d8dbd10eafafe Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 26 Sep 2019 20:34:22 +0200 Subject: [PATCH] btrfs-progs: build: install static library and headers in install-static Currently, the install-static target only installs the statically compiled tools. However, some programs outside of btrfs-progs (for example docker) link with the btrfs libraries. If such programs want to link statically against the btrfs-progs library, then this library should be installed by "install-static". Indeed, "make install" cannot be used if the support for shared library is not enabled. Pull-request: #211 Signed-off-by: Thomas Petazzoni [Gustavo: Rebase for btrfs-progs 4.7.2] Signed-off-by: Gustavo Zacarias [Vincent: Rebase for btrfs-progs 4.10] Signed-off-by: Vicente Olivert Riera [baruch: Rebase for btrfs-progs 4.16] Signed-off-by: Baruch Siach [Retrieved from: https://git.buildroot.net/buildroot/tree/package/btrfs-progs/0001-Makefile-install-static-library-and-headers-in-insta.patch] Signed-off-by: Fabrice Fontaine Signed-off-by: David Sterba --- Makefile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index f581ce2c..014736df 100644 --- a/Makefile +++ b/Makefile @@ -438,7 +438,7 @@ endif # NOTE: For static compiles, you need to have all the required libs # static equivalent available # -static: $(progs_static) +static: $(progs_static) $(libs_static) version.h: version.h.in configure.ac @echo " [SH] $@" @@ -769,6 +769,10 @@ install-static: $(progs_static) $(INSTALLDIRS) $(INSTALL) $(progs_static) $(DESTDIR)$(bindir) # btrfsck is a link to btrfs in the src tree, make it so for installed file as well $(LN_S) -f btrfs.static $(DESTDIR)$(bindir)/btrfsck.static + $(INSTALL) -m755 -d $(DESTDIR)$(libdir) + $(INSTALL) $(libs_static) $(DESTDIR)$(libdir) + $(INSTALL) -m755 -d $(DESTDIR)$(incdir)/btrfs + $(INSTALL) -m644 $(libbtrfs_headers) $(DESTDIR)$(incdir)/btrfs $(INSTALLDIRS): @echo "Making install in $(patsubst install-%,%,$@)"