treewide: homogenize references to libfts for MUSL

The way we use -lfts isn't particularly consistent.  There's no reason
it shouldn't be.  glibc users shouldn't have to deal with someone else's
lack of rigor.

Signed-off-by: Philip A. Prindeville <redacted>

diff --git a/admin/fluent-bit/Makefile b/admin/fluent-bit/Makefile
index 50b922143fc31d8de5582fe853d006643f0065fd..a3a0840a45197e69dc16c6fb089700b46fc2ca27 100644 (file)
--- a/admin/fluent-bit/Makefile
+++ b/admin/fluent-bit/Makefile
@@ -34,7 +34,7 @@ define Package/fluent-bit/conffiles
 /etc/fluent-bit/parsers.conf
 endef
 
-TARGET_LDFLAGS +=-lfts -latomic
+TARGET_LDFLAGS += $(if $(CONFIG_USE_MUSL),-lfts) -latomic
 
 CMAKE_OPTIONS+= \
        -DFLB_RELEASE=Yes \

diff --git a/lang/python/python-selinux/Makefile b/lang/python/python-selinux/Makefile
index 8d628b3e0c2383bc5ddf8c638a16061519f2c917..af7cf810df3744ad37a94ec2a46c530504b94d37 100644 (file)
--- a/lang/python/python-selinux/Makefile
+++ b/lang/python/python-selinux/Makefile
@@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=python-selinux
 PKG_VERSION:=3.10
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 SRC_NAME:=libselinux
 PKG_SOURCE:=$(SRC_NAME)-$(PKG_VERSION).tar.gz
@@ -34,7 +34,7 @@ define Package/python3-selinux
   SECTION:=lang
   CATEGORY:=Languages
   TITLE:=SELinux runtime library bindings
-  DEPENDS:=+python3-light +libselinux
+  DEPENDS:=+python3-light +libselinux +USE_MUSL:musl-fts
   URL:=https://github.com/selinuxproject
 endef
 

diff --git a/net/nfdump/Makefile b/net/nfdump/Makefile
index f844d3ed038654205da5331833ce563f2d1a3ff5..0b52d5b93693ff9cbbff28297195762ee2d6a33b 100644 (file)
--- a/net/nfdump/Makefile
+++ b/net/nfdump/Makefile
@@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=nfdump
 PKG_VERSION:=1.7.8
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_VERSION:=v$(PKG_VERSION)
@@ -42,7 +42,7 @@ define Package/nfdump/conffiles
 /etc/config/nfcapd
 endef
 
-TARGET_LDFLAGS += -Wl,--as-needed $(if $(CONFIG_USE_MUSL),-lfts)
+TARGET_LDFLAGS += $(if $(CONFIG_USE_MUSL),-lfts)
 
 define Package/nfdump/install
        $(INSTALL_DIR) $(1)/usr/lib

diff --git a/net/tcpreplay/Makefile b/net/tcpreplay/Makefile
index da3e9f54b325357afdf86f690b85d28e423b8451..eba59d6e652295f8e37fd01fec665b7a65a7d711 100644 (file)
--- a/net/tcpreplay/Makefile
+++ b/net/tcpreplay/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=tcpreplay
 PKG_VERSION:=4.5.2
-PKG_RELEASE:=4
+PKG_RELEASE:=5
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=https://github.com/appneta/tcpreplay/releases/download/v$(PKG_VERSION)
@@ -80,7 +80,7 @@ $(call Package/tcpreplay/default)
 endef
 
 define Package/tcpbridge/description
-  tcpbridge is a tool for selectively briding network traffic across two
+  tcpbridge is a tool for selectively bridging network traffic across two
   interfaces and optionally modifying the packets in between
 endef
 
@@ -127,10 +127,6 @@ define Package/tcpreplay-all/description
   to support switches, routers, and IP Flow/NetFlow appliances. 
 endef
 
-ifneq ($(CONFIG_USE_MUSL),)
-       TARGET_LDFLAGS+= -lfts
-endif
-
 CONFIGURE_VARS += \
        ac_cv_lib_nl_nl_cache_alloc=no \
        ac_cv_lib_nl_genl_3_genl_connect=no \
@@ -144,6 +140,7 @@ CONFIGURE_ARGS += \
        --with-libpcap="$(STAGING_DIR)/usr"
 
 TARGET_CFLAGS += -std=gnu11
+TARGET_LDFLAGS += $(if $(CONFIG_USE_MUSL),-lfts)
 
 define tcpreplayTemplate
   define Package/$(1)/install

diff --git a/utils/exfatprogs/Makefile b/utils/exfatprogs/Makefile
index dd45260b780004cc805cfe373e2b2c2be12b070e..536a99c493be614132720b2f7acf56856bfeaedf 100644 (file)
--- a/utils/exfatprogs/Makefile
+++ b/utils/exfatprogs/Makefile
@@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=exfatprogs
 PKG_VERSION:=1.4.1
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=https://github.com/exfatprogs/exfatprogs/releases/download/$(PKG_VERSION)
@@ -40,6 +40,8 @@ CONFIGURE_ARGS += \
        --enable-shared \
        --disable-static
 
+TARGET_LDFLAGS += $(if $(CONFIG_USE_MUSL),-lfts)
+
 define Package/exfat-mkfs/install
        $(INSTALL_DIR) $(1)/usr/sbin
        $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/mkfs.exfat $(1)/usr/sbin

diff --git a/utils/nnn/Makefile b/utils/nnn/Makefile
index fc43a9ec71303c7a597bd07b5fe126ef8fd455b8..ffb11145336498b1a496de55fe6db26bed2067b4 100644 (file)
--- a/utils/nnn/Makefile
+++ b/utils/nnn/Makefile
@@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=nnn
 PKG_VERSION:=5.1
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PKG_SOURCE:=$(PKG_NAME)-v$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/jarun/nnn/tar.gz/v$(PKG_VERSION)?
@@ -35,4 +35,6 @@ define Package/nnn/install
        $(INSTALL_BIN) $(PKG_BUILD_DIR)/nnn $(1)/usr/bin
 endef
 
+TARGET_LDFLAGS += $(if $(CONFIG_USE_MUSL),-lfts)
+
 $(eval $(call BuildPackage,nnn))

diff --git a/utils/nnn/patches/musl-fts.patch b/utils/nnn/patches/musl-fts.patch
deleted file mode 100644 (file)
index f2e6212..0000000
--- a/utils/nnn/patches/musl-fts.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -165,7 +165,7 @@ CFLAGS += -std=c11 -Wall -Wextra -Wshado
- CFLAGS += $(CFLAGS_OPTIMIZATION)
- CFLAGS += $(CFLAGS_CURSES)
- 
--LDLIBS += $(LDLIBS_CURSES) -lpthread
-+LDLIBS += $(LDLIBS_CURSES) -lpthread -lfts
- 
- # static compilation needs libgpm development package
- ifeq ($(strip $(O_STATIC)),1)