diff options
| author | Baruch Siach <baruch@tkos.co.il> | 2018-04-10 23:03:41 +0300 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2018-04-24 13:00:12 +0200 |
| commit | cc66055f97ef7ecdd77b18487b5c32f8334b8c8b (patch) | |
| tree | aab79471b4299e17ed5793f4a9ba05dabb620c44 | |
| parent | 3491d6277886ddc55643a133d0ebf05a4e0053ed (diff) | |
| download | btrfs-progs-cc66055f97ef7ecdd77b18487b5c32f8334b8c8b.tar.gz btrfs-progs-cc66055f97ef7ecdd77b18487b5c32f8334b8c8b.tar.bz2 btrfs-progs-cc66055f97ef7ecdd77b18487b5c32f8334b8c8b.zip | |
btrfs-progs: build btrfs.static needs libbtrfsutil to build
Add libbtrfsutil objects to btrfs.static link command. This fixes static
build failure:
utils.static.o: In function `parse_qgroupid':
utils.c:(.text.parse_qgroupid+0xb0): undefined reference to `btrfs_util_is_subvolume'
props.static.o: In function `prop_read_only':
props.c:(.text.prop_read_only+0x70): undefined reference to `btrfs_util_set_subvolume_read_only'
...
Makefile:457: recipe for target 'btrfs.static' failed
make[1]: *** [btrfs.static] Error 1
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: David Sterba <dsterba@suse.com>
| -rw-r--r-- | Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -257,6 +257,7 @@ endif static_objects = $(patsubst %.o, %.static.o, $(objects)) static_cmds_objects = $(patsubst %.o, %.static.o, $(cmds_objects)) static_libbtrfs_objects = $(patsubst %.o, %.static.o, $(libbtrfs_objects)) +static_libbtrfsutil_objects = $(patsubst %.o, %.static.o, $(libbtrfsutil_objects)) static_convert_objects = $(patsubst %.o, %.static.o, $(convert_objects)) static_mkfs_objects = $(patsubst %.o, %.static.o, $(mkfs_objects)) static_image_objects = $(patsubst %.o, %.static.o, $(image_objects)) @@ -449,7 +450,7 @@ btrfs: btrfs.o $(objects) $(cmds_objects) $(libs_static) @echo " [LD] $@" $(Q)$(CC) -o $@ $^ $(LDFLAGS) $(LIBS) $(LIBS_COMP) -btrfs.static: btrfs.static.o $(static_objects) $(static_cmds_objects) $(static_libbtrfs_objects) +btrfs.static: btrfs.static.o $(static_objects) $(static_cmds_objects) $(static_libbtrfs_objects) $(static_libbtrfsutil_objects) @echo " [LD] $@" $(Q)$(CC) -o $@ $^ $(STATIC_LDFLAGS) $(STATIC_LIBS) $(STATIC_LIBS_COMP) |