[openwrt/openwrt] e2fsprogs: fix compilation with musl 1.2.4

LEDE Commits lede-commits at lists.infradead.org
Tue May 16 07:33:48 PDT 2023


ynezz pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/466be0612aaed4034e15095b9fc63ce4cd99b87a

commit 466be0612aaed4034e15095b9fc63ce4cd99b87a
Author: Tianling Shen <cnsztl at immortalwrt.org>
AuthorDate: Tue May 16 15:49:08 2023 +0800

    e2fsprogs: fix compilation with musl 1.2.4
    
    musl 1.2.4 deprecated legacy "LFS64" ("large file support") interfaces and
    autotools failed to check the lseek64 function.
    
    Force enable ac_cv_func_lseek64 to workaround it.
    
    Signed-off-by: Tianling Shen <cnsztl at immortalwrt.org>
---
 package/utils/e2fsprogs/Makefile | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/package/utils/e2fsprogs/Makefile b/package/utils/e2fsprogs/Makefile
index 9437947ab6..42c2971529 100644
--- a/package/utils/e2fsprogs/Makefile
+++ b/package/utils/e2fsprogs/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=e2fsprogs
 PKG_VERSION:=1.47.0
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=@KERNEL/linux/kernel/people/tytso/e2fsprogs/v$(PKG_VERSION)/
@@ -156,6 +156,10 @@ CONFIGURE_ARGS += \
 	--disable-rpath		\
 	--disable-fuse2fs
 
+ifneq ($(CONFIG_USE_MUSL),)
+  CONFIGURE_VARS += ac_cv_func_lseek64=yes
+endif
+
 define Build/Prepare
 	$(call Build/Prepare/Default)
 	$(CP) $(SCRIPT_DIR)/config.{guess,sub} $(PKG_BUILD_DIR)/config/




More information about the lede-commits mailing list