domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libselinux: remove dependency on musl-fts for non-musl builds

Browse Source 
Suggested-by: Curtis Deptuck <curtdept@users.noreply.github.com>
Tested-by: Curtis Deptuck <curtdept@users.noreply.github.com>
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
This commit is contained in:
Daniel Golle
2020-10-31 00:06:53 +00:00
parent 2aa558c49a
commit 237f708b3c
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
package/libs/libselinux/Makefile
View File

@@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=libselinux PKG_NAME:=libselinux
PKG_VERSION:=3.1 PKG_VERSION:=3.1
PKG_RELEASE:=2 PKG_RELEASE:=3
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://github.com/SELinuxProject/selinux/releases/download/20200710 PKG_SOURCE_URL:=https://github.com/SELinuxProject/selinux/releases/download/20200710
@@ -69,7 +69,7 @@ define Package/libselinux
$(call Package/libselinux/Default) $(call Package/libselinux/Default)
SECTION:=libs SECTION:=libs
CATEGORY:=Libraries CATEGORY:=Libraries
DEPENDS:=+libsepol +libpcre +musl-fts DEPENDS:=+libsepol +libpcre +USE_MUSL:musl-fts
endef endef
define Package/libselinux/description define Package/libselinux/description
@@ -109,8 +109,11 @@ HOST_MAKE_FLAGS += \
PREFIX=$(STAGING_DIR_HOSTPKG) \ PREFIX=$(STAGING_DIR_HOSTPKG) \
SHLIBDIR=$(STAGING_DIR_HOSTPKG)/lib SHLIBDIR=$(STAGING_DIR_HOSTPKG)/lib
ifeq ($(CONFIG_USE_MUSL),y)
MAKE_FLAGS += FTS_LDLIBS=-lfts
endif
MAKE_FLAGS += \ MAKE_FLAGS += \
FTS_LDLIBS=-lfts \
SHLIBDIR=/usr/lib \ SHLIBDIR=/usr/lib \
OS=Linux OS=Linux