diff --git a/.travis.yml b/.travis.yml index 9410848b..40d603f4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -63,7 +63,7 @@ env: before_install: - sudo apt-get update -qq - - sudo apt-get install -qq e2fslibs-dev gcc clang libacl1-dev libblkid-dev libmount-dev liblzo2-dev make pkg-config udev zlib1g-dev acl attr reiserfsprogs python3-setuptools + - sudo apt-get install -qq e2fslibs-dev gcc clang libacl1-dev libblkid-dev liblzo2-dev make pkg-config udev zlib1g-dev acl attr reiserfsprogs python3-setuptools - echo -n | openssl s_client -connect scan.coverity.com:443 | sed -ne '/-BEGIN CERTIFICATE-/,/-END CERTIFICATE-/p' | sudo tee -a /etc/ssl/certs/ca- - docker pull kdave/ci-musl-x86_64 - ci/build-dep-reiserfs diff --git a/Android.mk b/Android.mk index a45e87aa..e56ab503 100644 --- a/Android.mk +++ b/Android.mk @@ -7,12 +7,12 @@ CFLAGS := -g -O1 -Wall -D_FORTIFY_SOURCE=2 -include config.h \ LDFLAGS := -static -rdynamic -LIBS := -luuid -lblkid -lmount -lz -llzo2 -L. -lpthread +LIBS := -luuid -lblkid -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 -lmount -lz -llzo2 -L. -pthread +STATIC_LIBS := -luuid -lblkid -luuid -lz -llzo2 -L. -pthread btrfs_shared_libraries := libext2_uuid \ libext2_blkid diff --git a/INSTALL b/INSTALL index bd98dd42..e2b6c7c3 100644 --- a/INSTALL +++ b/INSTALL @@ -5,7 +5,6 @@ The Btrfs utility programs require the following libraries/tools to build: - 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 diff --git a/Makefile.inc.in b/Makefile.inc.in index 1a80f479..9f493371 100644 --- a/Makefile.inc.in +++ b/Makefile.inc.in @@ -27,11 +27,11 @@ CRYPTO_CFLAGS = @GCRYPT_CFLAGS@ @SODIUM_CFLAGS@ @KCAPI_CFLAGS@ SUBST_CFLAGS = @CFLAGS@ SUBST_LDFLAGS = @LDFLAGS@ -LIBS_BASE = @UUID_LIBS@ @BLKID_LIBS@ @MOUNT_LIBS@ -L. -pthread +LIBS_BASE = @UUID_LIBS@ @BLKID_LIBS@ -L. -pthread LIBS_COMP = @ZLIB_LIBS@ @LZO2_LIBS@ @ZSTD_LIBS@ LIBS_PYTHON = @PYTHON_LIBS@ LIBS_CRYPTO = @GCRYPT_LIBS@ @SODIUM_LIBS@ @KCAPI_LIBS@ -STATIC_LIBS_BASE = @UUID_LIBS_STATIC@ @BLKID_LIBS_STATIC@ @MOUNT_LIBS_STATIC@ -L. -pthread +STATIC_LIBS_BASE = @UUID_LIBS_STATIC@ @BLKID_LIBS_STATIC@ -L. -pthread STATIC_LIBS_COMP = @ZLIB_LIBS_STATIC@ @LZO2_LIBS_STATIC@ @ZSTD_LIBS_STATIC@ prefix ?= @prefix@ diff --git a/configure.ac b/configure.ac index 39f93040..dd4adedf 100644 --- a/configure.ac +++ b/configure.ac @@ -262,9 +262,6 @@ 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])