summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--recipes-security/setools/setools/setools4-fixes-for-cross-compiling.patch16
-rw-r--r--recipes-security/setools/setools_4.6.0.bb (renamed from recipes-security/setools/setools_4.5.1.bb)4
2 files changed, 10 insertions, 10 deletions
diff --git a/recipes-security/setools/setools/setools4-fixes-for-cross-compiling.patch b/recipes-security/setools/setools/setools4-fixes-for-cross-compiling.patch
index cdaa45c..bc4cc1a 100644
--- a/recipes-security/setools/setools/setools4-fixes-for-cross-compiling.patch
+++ b/recipes-security/setools/setools/setools4-fixes-for-cross-compiling.patch
@@ -1,4 +1,4 @@
1From 673bac44ce13f475845e0b69dc73bfaa5a0866aa Mon Sep 17 00:00:00 2001 1From fedbd32adb2a9ef2ce3cf9424791f6ca3dd84d88 Mon Sep 17 00:00:00 2001
2From: Wenzong Fan <wenzong.fan@windriver.com> 2From: Wenzong Fan <wenzong.fan@windriver.com>
3Date: Tue, 14 Feb 2017 06:32:35 +0000 3Date: Tue, 14 Feb 2017 06:32:35 +0000
4Subject: [PATCH] setools4: fixes for cross compiling 4Subject: [PATCH] setools4: fixes for cross compiling
@@ -15,18 +15,18 @@ Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
15 1 file changed, 1 insertion(+), 1 deletion(-) 15 1 file changed, 1 insertion(+), 1 deletion(-)
16 16
17diff --git a/setup.py b/setup.py 17diff --git a/setup.py b/setup.py
18index 5584e55..057bbb5 100644 18index 0b8e3e9..a1ce872 100644
19--- a/setup.py 19--- a/setup.py
20+++ b/setup.py 20+++ b/setup.py
21@@ -79,7 +79,7 @@ class QtHelpCommand(Command): 21@@ -10,7 +10,7 @@ from Cython.Build import cythonize
22 22
23 23
24 # Library linkage 24 # Library linkage
25-lib_dirs = ['.', '/usr/lib64', '/usr/lib', '/usr/local/lib'] 25-lib_dirs: list[str] = ['.', '/usr/lib64', '/usr/lib', '/usr/local/lib']
26+lib_dirs = [os.environ["STAGING_LIBDIR"]] 26+lib_dirs: list[str] = [os.environ["STAGING_LIBDIR"]]
27 include_dirs = [] 27 include_dirs: list[str] = []
28 28
29 with suppress(KeyError): 29 userspace_src = os.getenv("USERSPACE_SRC", "")
30-- 30--
312.25.1 312.34.1
32 32
diff --git a/recipes-security/setools/setools_4.5.1.bb b/recipes-security/setools/setools_4.6.0.bb
index aaaace5..1c8bc79 100644
--- a/recipes-security/setools/setools_4.5.1.bb
+++ b/recipes-security/setools/setools_4.6.0.bb
@@ -5,10 +5,10 @@ libraries designed to facilitate SELinux policy analysis."
5SECTION = "base" 5SECTION = "base"
6LICENSE = "GPL-2.0-only & LGPL-2.1-only" 6LICENSE = "GPL-2.0-only & LGPL-2.1-only"
7 7
8SRC_URI = "git://github.com/SELinuxProject/${BPN}.git;branch=4.5;protocol=https \ 8SRC_URI = "git://github.com/SELinuxProject/${BPN}.git;branch=4.6;protocol=https \
9 file://setools4-fixes-for-cross-compiling.patch \ 9 file://setools4-fixes-for-cross-compiling.patch \
10 " 10 "
11SRCREV = "659ec47aba0126e3a198362ed1659bf600c067eb" 11SRCREV = "dfb95f338264f2d7ecab46b39479e4c29e44c09e"
12 12
13LIC_FILES_CHKSUM = "file://${S}/COPYING;md5=69a7b68f0a4a570d7c0c43465333ecbc \ 13LIC_FILES_CHKSUM = "file://${S}/COPYING;md5=69a7b68f0a4a570d7c0c43465333ecbc \
14 file://${S}/COPYING.GPL;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ 14 file://${S}/COPYING.GPL;md5=b234ee4d69f5fce4486a80fdaf4a4263 \