RepoMirrors/setools
1
0
Fork 0
mirror of https://github.com/SELinuxProject/setools synced 2025-03-11 07:18:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

setup.py: Update build for local SELinux userspace code.

Browse Source 
Now USERSPACE_SRC points to the top level directory that has the
libsepol, libselinux, and checkpolicy source trees.
This commit is contained in:
Chris PeBenito 2018-06-18 20:21:30 -04:00
parent 6d68ce463a
commit 57e4f464bf
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
setup.py
View File

@ -34,12 +34,17 @@ class QtHelpCommand(Command):
os.rename('qhc/apol.qhc', 'setoolsgui/apol/apol.qhc') os.rename('qhc/apol.qhc', 'setoolsgui/apol/apol.qhc')
os.rename('qhc/apol.qch', 'setoolsgui/apol/apol.qch') os.rename('qhc/apol.qch', 'setoolsgui/apol/apol.qch')
# Library linkage # Library linkage
lib_dirs = ['.', '/usr/lib64', '/usr/lib', '/usr/local/lib'] lib_dirs = ['.', '/usr/lib64', '/usr/lib', '/usr/local/lib']
include_dirs = [] include_dirs = []
with suppress(KeyError): with suppress(KeyError):
include_dirs.append(os.environ["SEPOL_SRC"] + "/include") userspace_src = os.environ["USERSPACE_SRC"]
include_dirs.insert(0, userspace_src + "/libsepol/include")
include_dirs.insert(1, userspace_src + "/libselinux/include")
lib_dirs.insert(0, userspace_src + "/libsepol/src")
lib_dirs.insert(1, userspace_src + "/libselinux/src")
if sys.platform.startswith('darwin'): if sys.platform.startswith('darwin'):
macros=[('DARWIN',1)] macros=[('DARWIN',1)]
@ -54,6 +59,8 @@ if enable_coverage:
ext_py_mods = [Extension('setools.policyrep.libpolicyrep', ['setools/policyrep/libpolicyrep.pyx'], ext_py_mods = [Extension('setools.policyrep.libpolicyrep', ['setools/policyrep/libpolicyrep.pyx'],
include_dirs=include_dirs, include_dirs=include_dirs,
libraries=['selinux', 'sepol'], libraries=['selinux', 'sepol'],
library_dirs=lib_dirs,
runtime_library_dirs=lib_dirs,
define_macros=macros, define_macros=macros,
extra_compile_args=['-Werror', '-Wextra', extra_compile_args=['-Werror', '-Wextra',
'-Waggregate-return', '-Waggregate-return',

6
tests/policyrep/util.py
View File

@ -37,9 +37,11 @@ def compile_policy(source_file, mls=True, xen=False):
fd, policy_path = tempfile.mkstemp() fd, policy_path = tempfile.mkstemp()
os.close(fd) os.close(fd)
try: if "USERSPACE_SRC" in os.environ:
command = [os.environ['USERSPACE_SRC'] + "/checkpolicy/checkpolicy"]
elif "CHECKPOLICY" in os.environ:
command = [os.environ['CHECKPOLICY']] command = [os.environ['CHECKPOLICY']]
except KeyError: else:
command = ["/usr/bin/checkpolicy"] command = ["/usr/bin/checkpolicy"]
if mls: if mls: