Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions admin/fluent-bit/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk

PKG_NAME:=fluent-bit
PKG_VERSION:=4.2.0
PKG_RELEASE:=2
PKG_RELEASE:=3

PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://github.com/fluent/fluent-bit.git
Expand Down Expand Up @@ -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 \
Expand All @@ -44,6 +44,7 @@ CMAKE_OPTIONS+= \
-DFLB_BACKTRACE=No \
-DFLB_WASM=No \
-DFLB_LUAJIT=No \
-DFLB_CORO_STACK_SIZE=4096 \
-DWITH_SASL=No \
-DWITH_ZLIB=No \
-DWITH_ZSTD=No
Expand Down
4 changes: 2 additions & 2 deletions lang/python/python-selinux/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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

Expand Down
4 changes: 2 additions & 2 deletions net/nfdump/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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
Expand Down
9 changes: 3 additions & 6 deletions net/tcpreplay/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -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 \
Expand All @@ -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
Expand Down
4 changes: 3 additions & 1 deletion utils/exfatprogs/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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
Expand Down
4 changes: 3 additions & 1 deletion utils/nnn/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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)?
Expand Down Expand Up @@ -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))
11 changes: 0 additions & 11 deletions utils/nnn/patches/musl-fts.patch

This file was deleted.

Loading