File 0001-btrfs-progs-build-add-libmount-dependency.patch of Package btrfsprogs.23274
From ca08befe722f1d9dead8da1e03feefc22d0aaad5 Mon Sep 17 00:00:00 2001 From: Marcos Paulo de Souza <mpdesouza@suse.com> Date: Tue, 12 Jan 2021 16:17:06 -0300 Subject: [PATCH 1/4] btrfs-progs: build: add libmount dependency API provided by libmount allows to read various information from /proc files about mount paths. Signed-off-by: Marcos Paulo de Souza <mpdesouza@suse.com> Signed-off-by: David Sterba <dsterba@suse.com> --- Android.mk | 4 ++-- INSTALL | 1 + Makefile.inc.in | 4 ++-- configure.ac | 3 +++ 4 files changed, 8 insertions(+), 4 deletions(-) --- a/Android.mk +++ b/Android.mk @@ -7,12 +7,12 @@ CFLAGS := -g -O1 -Wall -D_FORTIFY_SOURCE LDFLAGS := -static -rdynamic -LIBS := -luuid -lblkid -lz -llzo2 -L. -lpthread +LIBS := -luuid -lblkid -lmount -lz -llzo2 -L. -lpthread LIBBTRFS_LIBS := $(LIBS) STATIC_CFLAGS := $(CFLAGS) -ffunction-sections -fdata-sections STATIC_LDFLAGS := -static -Wl,--gc-sections -STATIC_LIBS := -luuid -lblkid -luuid -lz -llzo2 -L. -pthread +STATIC_LIBS := -luuid -lblkid -luuid -lmount -lz -llzo2 -L. -pthread btrfs_shared_libraries := libext2_uuid \ libext2_blkid --- a/INSTALL +++ b/INSTALL @@ -5,6 +5,7 @@ The Btrfs utility programs require the f - libuuid - provided by util-linux, e2fsprogs/e2fslibs or libuuid - libblkid - block device id library +- libmount - provided by util-linux, access /proc information about mount points - liblzo2 - LZO data compression library - zlib - ZLIB data compression library - libzstd - ZSTD data compression library version >= 1.0.0 --- a/Makefile.inc.in +++ b/Makefile.inc.in @@ -25,10 +25,10 @@ PYTHON_CFLAGS = @PYTHON_CFLAGS@ SUBST_CFLAGS = @CFLAGS@ SUBST_LDFLAGS = @LDFLAGS@ -LIBS_BASE = @UUID_LIBS@ @BLKID_LIBS@ -L. -pthread +LIBS_BASE = @UUID_LIBS@ @BLKID_LIBS@ @MOUNT_LIBS@ -L. -pthread LIBS_COMP = @ZLIB_LIBS@ @LZO2_LIBS@ @ZSTD_LIBS@ LIBS_PYTHON = @PYTHON_LIBS@ -STATIC_LIBS_BASE = @UUID_LIBS_STATIC@ @BLKID_LIBS_STATIC@ -L. -pthread +STATIC_LIBS_BASE = @UUID_LIBS_STATIC@ @BLKID_LIBS_STATIC@ @MOUNT_LIBS_STATIC@ -L. -pthread STATIC_LIBS_COMP = @ZLIB_LIBS_STATIC@ @LZO2_LIBS_STATIC@ @ZSTD_LIBS_STATIC@ prefix ?= @prefix@ --- a/configure.ac +++ b/configure.ac @@ -217,6 +217,9 @@ PKG_STATIC(BLKID_LIBS_STATIC, [blkid]) PKG_CHECK_MODULES(UUID, [uuid]) PKG_STATIC(UUID_LIBS_STATIC, [uuid]) +PKG_CHECK_MODULES(MOUNT, [mount]) +PKG_STATIC(MOUNT_LIBS_STATIC, [mount]) + PKG_CHECK_MODULES(ZLIB, [zlib]) PKG_STATIC(ZLIB_LIBS_STATIC, [zlib])
