diff options
author | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2014-08-30 14:48:10 +0200 |
---|---|---|
committer | David Sterba <dsterba@suse.cz> | 2014-09-02 17:05:23 +0200 |
commit | 1cb7bd2f3c1c26508af5ca3cace4826b5760ee81 (patch) | |
tree | 471416e0693b607b875213e53f5b68e5291bc702 | |
parent | ef208e98cea2918aedb78f182b24461b9a5c275f (diff) | |
download | btrfs-progs-1cb7bd2f3c1c26508af5ca3cace4826b5760ee81.tar.gz |
btrfs-progs: Improve static building and installation
This commit improves the static-only building of btrfs-progs, and adds
support for installing the static only tools:
- It now ensures that all programs are built statically, not only a
small subset of them, by defining 'progs_static' from the existing
'progs' variable.
- It changes the order of libraries in the btrfs-%.static rule so
that -lpthread (part of STATIC_LIBS) appears *after* the '$($(subst
-,_,$(subst .static,,$@)-libs))' logic, which brings in
-lcom_err. This is needed because libcom_err.a uses the semaphore
functions, which are available in the pthread library.
- Adds the necessary rules to generate the btrfsck.static link and
btrfstune.static binary.
- Adds an 'install-static' target to install the static
binaries. Note that they are renamed to not carry a '.static'
suffix.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: David Sterba <dsterba@suse.cz>
-rw-r--r-- | Makefile | 22 |
1 files changed, 19 insertions, 3 deletions
@@ -50,6 +50,8 @@ progs = mkfs.btrfs btrfs-debug-tree btrfsck \ btrfs btrfs-map-logical btrfs-image btrfs-zero-log btrfs-convert \ btrfs-find-root btrfstune btrfs-show-super +progs_static = $(foreach p,$(progs),$(p).static) + # external libs required by various binaries; for btrfs-foo, # specify btrfs_foo_libs = <list of libs>; see $($(subst...)) rules below btrfs_convert_libs = -lext2fs -lcom_err @@ -141,7 +143,7 @@ test: # NOTE: For static compiles, you need to have all the required libs # static equivalent available # -static: btrfs.static mkfs.btrfs.static btrfs-find-root.static +static: $(progs_static) version.h: @echo " [SH] $@" @@ -174,8 +176,8 @@ $(lib_links): btrfs-%.static: $(static_objects) btrfs-%.static.o $(static_libbtrfs_objects) @echo " [LD] $@" $(Q)$(CC) $(STATIC_CFLAGS) -o $@ $@.o $(static_objects) \ - $(static_libbtrfs_objects) $(STATIC_LDFLAGS) $(STATIC_LIBS) \ - $($(subst -,_,$(subst .static,,$@)-libs)) + $(static_libbtrfs_objects) $(STATIC_LDFLAGS) \ + $($(subst -,_,$(subst .static,,$@)-libs)) $(STATIC_LIBS) btrfs-%: $(objects) $(libs) btrfs-%.o @echo " [LD] $@" @@ -196,6 +198,10 @@ btrfsck: btrfs @echo " [LN] $@" $(Q)$(LN) -f btrfs btrfsck +btrfsck.static: btrfs.static + @echo " [LN] $@" + $(Q)$(LN) -f $^ $@ + mkfs.btrfs: $(objects) $(libs) mkfs.o @echo " [LD] $@" $(Q)$(CC) $(CFLAGS) -o mkfs.btrfs $(objects) mkfs.o $(LDFLAGS) $(LIBS) @@ -209,6 +215,11 @@ btrfstune: $(objects) $(libs) btrfstune.o @echo " [LD] $@" $(Q)$(CC) $(CFLAGS) -o btrfstune $(objects) btrfstune.o $(LDFLAGS) $(LIBS) +btrfstune.static: $(static_objects) btrfstune.static.o $(static_libbtrfs_objects) + @echo " [LD] $@" + $(Q)$(CC) $(STATIC_CFLAGS) -o $@ btrfstune.static.o $(static_objects) \ + $(static_libbtrfs_objects) $(STATIC_LDFLAGS) $(STATIC_LIBS) + dir-test: $(objects) $(libs) dir-test.o @echo " [LD] $@" $(Q)$(CC) $(CFLAGS) -o dir-test $(objects) dir-test.o $(LDFLAGS) $(LIBS) @@ -258,6 +269,11 @@ install: $(libs) $(progs) $(INSTALLDIRS) $(INSTALL) -m755 -d $(DESTDIR)$(incdir) $(INSTALL) -m644 $(headers) $(DESTDIR)$(incdir) +install-static: $(progs_static) $(INSTALLDIRS) + for p in $(progs_static) ; do \ + $(INSTALL) -D -m755 $$p $(DESTDIR)$(bindir)/`basename $$p .static` ; \ + done + $(INSTALLDIRS): @echo "Making install in $(patsubst install-%,%,$@)" $(Q)$(MAKE) $(MAKEOPTS) -C $(patsubst install-%,%,$@) install |