Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

setools: Avoid using host libraries

Browse source 
This adds $STAGING_DIR to library search paths in setup.py, to avoid
picking up host libraries when linking.

Signed-off-by: Eneas U de Queiroz <cotequeiroz@gmail.com>
This commit is contained in:
Eneas U de Queiroz 2021-01-19 21:20:55 -03:00
parent d8203191cc
commit 0aff79f29f
No known key found for this signature in database
GPG key ID: 5FB9FAF260B80AEA
2 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
utils/setools/Makefile
View file

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

12
utils/setools/patches/030-remove-host-paths.patch Normal file
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):