Browse Source

Merge pull request #14893 from cotequeiroz/setools

setools: Avoid using host libraries
lilik-openwrt-22.03
Rosen Penev 4 years ago
committed by GitHub
parent
commit
66ba43293e
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 1 deletions
  1. +1
    -1
      utils/setools/Makefile
  2. +12
    -0
      utils/setools/patches/030-remove-host-paths.patch

+ 1
- 1
utils/setools/Makefile View File

@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=setools
PKG_VERSION:=4.3.0
PKG_RELEASE:=2
PKG_RELEASE:=3
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=https://github.com/SELinuxProject/setools/releases/download/4.3.0


+ 12
- 0
utils/setools/patches/030-remove-host-paths.patch View File

@ -0,0 +1,12 @@
--- a/setup.py
+++ b/setup.py
@@ -79,7 +79,8 @@ class QtHelpCommand(Command):
# Library linkage
-lib_dirs = ['.', '/usr/lib64', '/usr/lib', '/usr/local/lib']
+owrt_staging_dir = os.environ["STAGING_DIR"]
+lib_dirs = ['.', owrt_staging_dir + '/usr/lib64', owrt_staging_dir + '/usr/lib', owrt_staging_dir + '/usr/local/lib' ]
include_dirs = []
with suppress(KeyError):

Loading…
Cancel
Save