Merge pull request #14893 from cotequeiroz/setools

setools: Avoid using host libraries
2021-02-24 20:08:15 -08:00 · 2021-02-24 20:08:15 -08:00 · 66ba43293e
parent 31dac1a0ed 0aff79f29f
commit 66ba43293e
2 changed files with 13 additions and 1 deletions
--- a/utils/setools/Makefile
+++ b/utils/setools/Makefile
@ -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
--- a/utils/setools/patches/030-remove-host-paths.patch
+++ b/utils/setools/patches/030-remove-host-paths.patch
@ -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):