Skip to content

Commit 0c5f9a6

Browse files
committed
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 <philipp@redfish-solutions.com>
1 parent f5160c8 commit 0c5f9a6

7 files changed

Lines changed: 15 additions & 25 deletions

File tree

admin/fluent-bit/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
22

33
PKG_NAME:=fluent-bit
44
PKG_VERSION:=4.2.0
5-
PKG_RELEASE:=2
5+
PKG_RELEASE:=3
66

77
PKG_SOURCE_PROTO:=git
88
PKG_SOURCE_URL:=https://github.com/fluent/fluent-bit.git
@@ -34,7 +34,7 @@ define Package/fluent-bit/conffiles
3434
/etc/fluent-bit/parsers.conf
3535
endef
3636

37-
TARGET_LDFLAGS +=-lfts -latomic
37+
TARGET_LDFLAGS += $(if $(CONFIG_USE_MUSL),-lfts) -latomic
3838

3939
CMAKE_OPTIONS+= \
4040
-DFLB_RELEASE=Yes \

lang/python/python-selinux/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk
77

88
PKG_NAME:=python-selinux
99
PKG_VERSION:=3.10
10-
PKG_RELEASE:=1
10+
PKG_RELEASE:=2
1111

1212
SRC_NAME:=libselinux
1313
PKG_SOURCE:=$(SRC_NAME)-$(PKG_VERSION).tar.gz
@@ -34,7 +34,7 @@ define Package/python3-selinux
3434
SECTION:=lang
3535
CATEGORY:=Languages
3636
TITLE:=SELinux runtime library bindings
37-
DEPENDS:=+python3-light +libselinux
37+
DEPENDS:=+python3-light +libselinux +USE_MUSL:musl-fts
3838
URL:=https://github.com/selinuxproject
3939
endef
4040

net/nfdump/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk
77

88
PKG_NAME:=nfdump
99
PKG_VERSION:=1.7.8
10-
PKG_RELEASE:=1
10+
PKG_RELEASE:=2
1111

1212
PKG_SOURCE_PROTO:=git
1313
PKG_SOURCE_VERSION:=v$(PKG_VERSION)
@@ -42,7 +42,7 @@ define Package/nfdump/conffiles
4242
/etc/config/nfcapd
4343
endef
4444

45-
TARGET_LDFLAGS += -Wl,--as-needed $(if $(CONFIG_USE_MUSL),-lfts)
45+
TARGET_LDFLAGS += $(if $(CONFIG_USE_MUSL),-lfts)
4646

4747
define Package/nfdump/install
4848
$(INSTALL_DIR) $(1)/usr/lib

net/tcpreplay/Makefile

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
99

1010
PKG_NAME:=tcpreplay
1111
PKG_VERSION:=4.5.2
12-
PKG_RELEASE:=4
12+
PKG_RELEASE:=5
1313

1414
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
1515
PKG_SOURCE_URL:=https://github.com/appneta/tcpreplay/releases/download/v$(PKG_VERSION)
@@ -80,7 +80,7 @@ $(call Package/tcpreplay/default)
8080
endef
8181

8282
define Package/tcpbridge/description
83-
tcpbridge is a tool for selectively briding network traffic across two
83+
tcpbridge is a tool for selectively bridging network traffic across two
8484
interfaces and optionally modifying the packets in between
8585
endef
8686

@@ -127,10 +127,6 @@ define Package/tcpreplay-all/description
127127
to support switches, routers, and IP Flow/NetFlow appliances.
128128
endef
129129

130-
ifneq ($(CONFIG_USE_MUSL),)
131-
TARGET_LDFLAGS+= -lfts
132-
endif
133-
134130
CONFIGURE_VARS += \
135131
ac_cv_lib_nl_nl_cache_alloc=no \
136132
ac_cv_lib_nl_genl_3_genl_connect=no \
@@ -144,6 +140,7 @@ CONFIGURE_ARGS += \
144140
--with-libpcap="$(STAGING_DIR)/usr"
145141

146142
TARGET_CFLAGS += -std=gnu11
143+
TARGET_LDFLAGS += $(if $(CONFIG_USE_MUSL),-lfts)
147144

148145
define tcpreplayTemplate
149146
define Package/$(1)/install

utils/exfatprogs/Makefile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
22

33
PKG_NAME:=exfatprogs
44
PKG_VERSION:=1.4.1
5-
PKG_RELEASE:=1
5+
PKG_RELEASE:=2
66

77
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
88
PKG_SOURCE_URL:=https://github.com/exfatprogs/exfatprogs/releases/download/$(PKG_VERSION)
@@ -40,6 +40,8 @@ CONFIGURE_ARGS += \
4040
--enable-shared \
4141
--disable-static
4242

43+
TARGET_LDFLAGS += $(if $(CONFIG_USE_MUSL),-lfts)
44+
4345
define Package/exfat-mkfs/install
4446
$(INSTALL_DIR) $(1)/usr/sbin
4547
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/mkfs.exfat $(1)/usr/sbin

utils/nnn/Makefile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
22

33
PKG_NAME:=nnn
44
PKG_VERSION:=5.1
5-
PKG_RELEASE:=2
5+
PKG_RELEASE:=3
66

77
PKG_SOURCE:=$(PKG_NAME)-v$(PKG_VERSION).tar.gz
88
PKG_SOURCE_URL:=https://codeload.github.com/jarun/nnn/tar.gz/v$(PKG_VERSION)?
@@ -35,4 +35,6 @@ define Package/nnn/install
3535
$(INSTALL_BIN) $(PKG_BUILD_DIR)/nnn $(1)/usr/bin
3636
endef
3737

38+
TARGET_LDFLAGS += $(if $(CONFIG_USE_MUSL),-lfts)
39+
3840
$(eval $(call BuildPackage,nnn))

utils/nnn/patches/musl-fts.patch

Lines changed: 0 additions & 11 deletions
This file was deleted.

0 commit comments

Comments
 (0)