Static build fixed (Was: Re: Btrfs progs pre-release 4.4-rc1
diff mbox

Message ID 20160115124301.GD4227@twin.jikos.cz
State New
Headers show

Commit Message

David Sterba Jan. 15, 2016, 12:43 p.m. UTC
On Thu, Jan 14, 2016 at 09:41:58AM -0500, Noah Massey wrote:
>     [LD]     btrfs.static
> help.static.o: In function `usage_command':
> /usr/local/src/btrfs-progs/help.c:120: multiple definition of `usage_command'
> help.static.o:/usr/local/src/btrfs-progs/help.c:120: first defined here
...
> 
> git bisect blames  a6cc8ea10ad84e4b7d1303ed048e644f0dd7ae04

Thanks, I'm committing the following patch as you found the fix faster.

---
commit 1bb0bba1b625eec1bd288699f10c8855034daef1
Author: Noah Massey <noah.massey@gmail.com>
Date:   Fri Jan 15 13:31:01 2016 +0100

    btrfs-progs: fix static build

    Change in "btrfs-progs: introduce helper for parsing args without
    options" added a dependency on help.o that was duplicated for the static
    build.

    Signed-off-by: Noah Massey <noah.massey@gmail.com>
    Signed-off-by: David Sterba <dsterba@suse.com>

--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch
diff mbox

diff --git a/Makefile.in b/Makefile.in
index 1bd497aca469..19697ffaf0bf 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -265,9 +265,9 @@  btrfs: $(objects) btrfs.o $(cmds_objects) $(libs_static)
        $(Q)$(CC) $(CFLAGS) -o btrfs btrfs.o $(cmds_objects) \
                $(objects) $(libs_static) $(LDFLAGS) $(LIBS)

-btrfs.static: $(static_objects) btrfs.static.o help.static.o $(static_cmds_objects) $(static_libbtrfs_objects)
+btrfs.static: $(static_objects) btrfs.static.o $(static_cmds_objects) $(static_libbtrfs_objects)
        @echo "    [LD]     $@"
-       $(Q)$(CC) $(STATIC_CFLAGS) -o btrfs.static btrfs.static.o help.static.o $(static_cmds_objects) \
+       $(Q)$(CC) $(STATIC_CFLAGS) -o btrfs.static btrfs.static.o $(static_cmds_objects) \
                $(static_objects) $(static_libbtrfs_objects) $(STATIC_LDFLAGS) $(STATIC_LIBS)

 # For backward compatibility, 'btrfs' changes behaviour to fsck if it's named 'btrfsck'