Jelajahi Sumber

util-linux: Fix build when libmagic is present

When the libmagic from the file package in the packages feed was also
compiled and provided its libmagic.so file, util-linux tried to link
against it. Avoid this by explicitly disable libmagic support.

This fixes the following build error:
Package more is missing dependencies for the following libraries:
libmagic.so.1

Fixes: 36d9ed360a34 ("util-linux: update to 2.36")
Acked-by: Sebastian Kemper <[email protected]>
Signed-off-by: Rosen Penev <[email protected]>
[Add commit description]
Signed-off-by: Hauke Mehrtens <[email protected]>
Rosen Penev 5 tahun lalu
induk
melakukan
83e946d718
1 mengubah file dengan 2 tambahan dan 1 penghapusan
  1. 2 1
      package/utils/util-linux/Makefile

+ 2 - 1
package/utils/util-linux/Makefile

@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=util-linux
 PKG_VERSION:=2.36
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=@KERNEL/linux/utils/$(PKG_NAME)/v2.36
@@ -526,6 +526,7 @@ CONFIGURE_ARGS += \
 	--without-python		\
 	--without-udev			\
 	--without-readline		\
+	--without-libmagic		\
 	--with-ncursesw
 
 TARGET_CFLAGS += $(FPIC) -std=gnu99