RepoMirrors/btrfs-progs
1
0
Fork 0
mirror of https://github.com/kdave/btrfs-progs synced 2025-04-11 03:31:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

btrfs-progs: remove workarounds for libmount and static build

Browse Source 
Partial revert of 922eaa7b54 ("btrfs-progs: build: fix linking with
static libmount"), remove the necessary workarounds like the weak
symbols and link time warnings. Symbols renamed not to clash with
libmount (parse_size, canonicalize_path) haven't been reverted because
the new names are acceptable.

Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
David Sterba 2021-02-17 13:52:01 +01:00
parent 798d34074c
commit b604e0eda2
2 changed files with 1 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Makefile
View File

@ -129,18 +129,10 @@ LIBS = $(LIBS_BASE) $(LIBS_CRYPTO)
LIBBTRFS_LIBS = $(LIBS_BASE) $(LIBS_CRYPTO)
# Static compilation flags
STATIC_CFLAGS = $(CFLAGS) -ffunction-sections -fdata-sections -DSTATICBUILD=1
STATIC_CFLAGS = $(CFLAGS) -ffunction-sections -fdata-sections
STATIC_LDFLAGS = -static -Wl,--gc-sections
STATIC_LIBS = $(STATIC_LIBS_BASE)
# Static build with libmount print some warnings due to usage of UID/GID
# functions that require some glibc dynamic functionality at runtime.
# The following can be ignored:
# - mnt_get_gid using getgrnam_r
# - mnt_get_uid using getpwnam_r
# - mnt_get_username using getpwuid_r
STATICWARNING = @echo " NOTE: warnings about getgrnam_r/mnt_get_uid/... are harmless, building"
# don't use FORTIFY with sparse because glibc with FORTIFY can
# generate so many sparse errors that sparse stops parsing,
# which masks real errors that we want to see.
@ -549,7 +541,6 @@ endif
btrfs-%.static: btrfs-%.static.o $(static_objects) $(patsubst %.o,%.static.o,$(standalone_deps)) $(static_libbtrfs_objects)
@echo " [LD] $@"
$(STATICWARNING) $@
$(Q)$(CC) -o $@ $@.o $(static_objects) \
$(patsubst %.o, %.static.o, $($(subst -,_,$(subst .static,,$@)-objects))) \
$(static_libbtrfs_objects) $(STATIC_LDFLAGS) \
@ -568,7 +559,6 @@ btrfs: btrfs.o $(objects) $(cmds_objects) $(libs_static)
btrfs.static: btrfs.static.o $(static_objects) $(static_cmds_objects) $(static_libbtrfs_objects) $(static_libbtrfsutil_objects)
@echo " [LD] $@"
$(STATICWARNING) $@
$(Q)$(CC) -o $@ $^ $(STATIC_LDFLAGS) $(STATIC_LIBS) $(STATIC_LIBS_COMP)
btrfs.box: btrfs.box.o $(objects) $(cmds_objects) $(progs_box_objects) $(libs_static)
@ -577,7 +567,6 @@ btrfs.box: btrfs.box.o $(objects) $(cmds_objects) $(progs_box_objects) $(libs_st
btrfs.box.static: btrfs.box.static.o $(static_objects) $(static_cmds_objects) $(progs_box_static_objects) $(static_libbtrfs_objects) $(static_libbtrfsutil_objects)
@echo " [LD] $@"
$(STATICWARNING) $@
$(Q)$(CC) $(STATIC_CFLAGS) -o $@ $^ $(btrfs_convert_libs) \
$(STATIC_LDFLAGS) $(STATIC_LIBS) $(STATIC_LIBS_COMP)
@ -598,7 +587,6 @@ btrfsck: btrfs
btrfsck.static: btrfs.static
@echo " [LN] $@"
$(STATICWARNING) $@
$(Q)$(LN_S) -f $^ $@
mkfs.btrfs: $(mkfs_objects) $(objects) $(libs_static)
@ -607,7 +595,6 @@ mkfs.btrfs: $(mkfs_objects) $(objects) $(libs_static)
mkfs.btrfs.static: $(static_mkfs_objects) $(static_objects) $(static_libbtrfs_objects)
@echo " [LD] $@"
$(STATICWARNING) $@
$(Q)$(CC) -o $@ $^ $(STATIC_LDFLAGS) $(STATIC_LIBS)
btrfstune: btrfstune.o $(objects) $(libs_static)
@ -616,7 +603,6 @@ btrfstune: btrfstune.o $(objects) $(libs_static)
btrfstune.static: btrfstune.static.o $(static_objects) $(static_libbtrfs_objects)
@echo " [LD] $@"
$(STATICWARNING) $@
$(Q)$(CC) -o $@ $^ $(STATIC_LDFLAGS) $(STATIC_LIBS)
btrfs-image: $(image_objects) $(objects) $(libs_static)
@ -625,7 +611,6 @@ btrfs-image: $(image_objects) $(objects) $(libs_static)
btrfs-image.static: $(static_image_objects) $(static_objects) $(static_libbtrfs_objects)
@echo " [LD] $@"
$(STATICWARNING) $@
$(Q)$(CC) -o $@ $^ $(STATIC_LDFLAGS) $(STATIC_LIBS) $(STATIC_LIBS_COMP)
btrfs-convert: $(convert_objects) $(objects) $(libs_static)
@ -634,7 +619,6 @@ btrfs-convert: $(convert_objects) $(objects) $(libs_static)
btrfs-convert.static: $(static_convert_objects) $(static_objects) $(static_libbtrfs_objects)
@echo " [LD] $@"
$(STATICWARNING) $@
$(Q)$(CC) -o $@ $^ $(STATIC_LDFLAGS) $(btrfs_convert_libs) $(STATIC_LIBS)
quick-test: quick-test.o $(objects) $(libs)

19
common/utils.c
View File

@ -2335,22 +2335,3 @@ out:
return ret;
}
#ifdef STATICBUILD
/*
* libmount links with selinux that we don't use, the following symbols are
* missing. Weak aliases allow to link.
*/
__attribute__((weak)) int selinux_trans_to_raw_context(const char * trans, char ** rawp)
{
return -1;
}
typedef void *security_context_t;
__attribute__((weak)) void freecon(security_context_t con)
{
}
#endif