37 lines
1.5 KiB
Diff
37 lines
1.5 KiB
Diff
|
From 9ee71d74d9ed339b6c7a886125d57eb3bde84547 Mon Sep 17 00:00:00 2001
|
||
|
|
From: David Sterba <dsterba@suse.com>
|
||
|
|
Date: Fri, 6 Apr 2018 17:39:56 +0200
|
||
|
|
Subject: [PATCH] btrfs-progs: build: fix static build
|
||
|
|
|
||
|
|
Add missing libbtrfsutil objects to btrfs.static.
|
||
|
|
|
||
|
|
Signed-off-by: David Sterba <dsterba@suse.com>
|
||
|
|
---
|
||
|
|
Makefile | 3 ++-
|
||
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/Makefile b/Makefile
|
||
|
|
index 5ba76d2eee40..8785ca2af77e 100644
|
||
|
|
--- a/Makefile
|
||
|
|
+++ b/Makefile
|
||
|
|
@@ -261,6 +261,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))
|
||
|
|
@@ -453,7 +454,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)
|
||
|
|
|
||
|
|
--
|
||
|
|
2.16.2
|
||
|
|
|