Commit a9636852 authored by Thomas Petazzoni's avatar Thomas Petazzoni
Browse files

libsemanage: misc improvements 



This commit should have been part of the "libsemanage: new package"
commit, but due a mistake, the former commit was pushed before those
changes were squashed into it.

Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
parent ab2f2484

package/libsemanage/Config.in

+5 −5
Original line number Diff line number Diff line
@@ -16,15 +16,15 @@ config BR2_PACKAGE_LIBSEMANAGE 


	  http://selinuxproject.org/page/Main_Page



comment "libsemanage needs a toolchain w/ largefile, threads"

	depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_LARGEFILE



if BR2_PACKAGE_LIBSEMANAGE



config BR2_PACKAGE_LIBSEMANAGE_PYTHON_BINDINGS

	select BR2_PACKAGE_PYTHON

	depends on BR2_PACKAGE_PYTHON

	bool "python bindings"

	help

	  enable building python bindings

	  Enable building python bindings



endif



comment "libsemanage needs a toolchain w/ largefile, threads"

	depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_LARGEFILE

package/libsemanage/libsemanage.mk

+9 −9
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ LIBSEMANAGE_MAKE_OPTS = $(TARGET_CONFIGURE_OPTS) 


ifeq ($(BR2_PACKAGE_LIBSEMANAGE_PYTHON_BINDINGS),y)



LIBSEMANAGE_DEPENDENCIES += python host-swig host-python

LIBSEMANAGE_DEPENDENCIES += python host-swig

LIBSEMANAGE_MAKE_OPTS += \

	PYINC="-I$(STAGING_DIR)/usr/include/python$(PYTHON_VERSION_MAJOR)/" \

	PYTHONLIBDIR="-L$(STAGING_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)/" \
@@ -29,11 +29,11 @@ define LIBSEMANAGE_PYTHON_BUILD_CMDS 
endef



define LIBSEMANAGE_PYTHON_INSTALL_STAGING_CMDS

	$(MAKE) -C $(@D) install-pywrap $(LIBSEMANAGE_MAKE_OPTS) DESTDIR=$(STAGING_DIR)

	$(MAKE) -C $(@D) $(LIBSEMANAGE_MAKE_OPTS) DESTDIR=$(STAGING_DIR) install-pywrap

endef



define LIBSEMANAGE_PYTHON_INSTALL_TARGET_CMDS

	$(MAKE) -C $(@D) install-pywrap $(LIBSEMANAGE_MAKE_OPTS) DESTDIR=$(TARGET_DIR)

	$(MAKE) -C $(@D) $(LIBSEMANAGE_MAKE_OPTS) DESTDIR=$(TARGET_DIR) install-pywrap

endef



endif # End of BR2_PACKAGE_PYTHON
@@ -46,12 +46,12 @@ define LIBSEMANAGE_BUILD_CMDS 
endef



define LIBSEMANAGE_INSTALL_STAGING_CMDS

	$(MAKE) -C $(@D) install $(LIBSEMANAGE_MAKE_OPTS) DESTDIR=$(STAGING_DIR)

	$(MAKE) -C $(@D) $(LIBSEMANAGE_MAKE_OPTS) DESTDIR=$(STAGING_DIR) install

	$(LIBSEMANAGE_PYTHON_INSTALL_STAGING_CMDS)

endef



define LIBSEMANAGE_INSTALL_TARGET_CMDS

	$(MAKE) -C $(@D) install $(LIBSEMANAGE_MAKE_OPTS) DESTDIR=$(TARGET_DIR)

	$(MAKE) -C $(@D) $(LIBSEMANAGE_MAKE_OPTS) DESTDIR=$(TARGET_DIR) install

	$(LIBSEMANAGE_PYTHON_INSTALL_TARGET_CMDS)

endef
@@ -61,11 +61,11 @@ HOST_LIBSEMANAGE_DEPENDENCIES = host-bison host-libsepol \ 
define HOST_LIBSEMANAGE_BUILD_CMDS

	# DESTDIR is needed during the compile to compute library and

	# header paths.

	$(MAKE) -C $(@D) all $(HOST_CONFIGURE_OPTS) DESTDIR=$(HOST_DIR)

	$(MAKE) -C $(@D) $(HOST_CONFIGURE_OPTS) DESTDIR=$(HOST_DIR) all

endef



define HOST_LIBSEMANAGE_INSTALL_CMDS

	$(MAKE) -C $(@D) install $(HOST_CONFIGURE_OPTS) DESTDIR=$(HOST_DIR)

	$(MAKE) -C $(@D) $(HOST_CONFIGURE_OPTS) DESTDIR=$(HOST_DIR) install

endef



$(eval $(generic-package))