jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-28 05:36:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

libsemanage: misc improvements

Browse Source 
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: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
Thomas Petazzoni 2015-01-01 22:27:13 +01:00
parent ab2f2484ba
commit a963685245
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
package/libsemanage/Config.in
View File

@ -16,15 +16,15 @@ config BR2_PACKAGE_LIBSEMANAGE
http://selinuxproject.org/page/Main_Page 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 if BR2_PACKAGE_LIBSEMANAGE
config BR2_PACKAGE_LIBSEMANAGE_PYTHON_BINDINGS config BR2_PACKAGE_LIBSEMANAGE_PYTHON_BINDINGS
select BR2_PACKAGE_PYTHON depends on BR2_PACKAGE_PYTHON
bool "python bindings" bool "python bindings"
help help
enable building python bindings Enable building python bindings
endif endif
comment "libsemanage needs a toolchain w/ largefile, threads"
depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_LARGEFILE

18
package/libsemanage/libsemanage.mk
View File

@ -17,7 +17,7 @@ LIBSEMANAGE_MAKE_OPTS = $(TARGET_CONFIGURE_OPTS)
ifeq ($(BR2_PACKAGE_LIBSEMANAGE_PYTHON_BINDINGS),y) ifeq ($(BR2_PACKAGE_LIBSEMANAGE_PYTHON_BINDINGS),y)
LIBSEMANAGE_DEPENDENCIES += python host-swig host-python LIBSEMANAGE_DEPENDENCIES += python host-swig
LIBSEMANAGE_MAKE_OPTS += \ LIBSEMANAGE_MAKE_OPTS += \
PYINC="-I$(STAGING_DIR)/usr/include/python$(PYTHON_VERSION_MAJOR)/" \ PYINC="-I$(STAGING_DIR)/usr/include/python$(PYTHON_VERSION_MAJOR)/" \
PYTHONLIBDIR="-L$(STAGING_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)/" \ PYTHONLIBDIR="-L$(STAGING_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)/" \
@ -29,29 +29,29 @@ define LIBSEMANAGE_PYTHON_BUILD_CMDS
endef endef
define LIBSEMANAGE_PYTHON_INSTALL_STAGING_CMDS 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 endef
define LIBSEMANAGE_PYTHON_INSTALL_TARGET_CMDS 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 endef
endif # End of BR2_PACKAGE_PYTHON endif # End of BR2_PACKAGE_PYTHON
define LIBSEMANAGE_BUILD_CMDS define LIBSEMANAGE_BUILD_CMDS
# DESTDIR is needed during the compile to compute library and # DESTDIR is needed during the compile to compute library and
# header paths. # header paths.
$(MAKE) -C $(@D) $(LIBSEMANAGE_MAKE_OPTS) DESTDIR=$(STAGING_DIR) all $(MAKE) -C $(@D) $(LIBSEMANAGE_MAKE_OPTS) DESTDIR=$(STAGING_DIR) all
$(LIBSEMANAGE_PYTHON_BUILD_CMDS) $(LIBSEMANAGE_PYTHON_BUILD_CMDS)
endef endef
define LIBSEMANAGE_INSTALL_STAGING_CMDS 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) $(LIBSEMANAGE_PYTHON_INSTALL_STAGING_CMDS)
endef endef
define LIBSEMANAGE_INSTALL_TARGET_CMDS 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) $(LIBSEMANAGE_PYTHON_INSTALL_TARGET_CMDS)
endef endef
@ -59,13 +59,13 @@ HOST_LIBSEMANAGE_DEPENDENCIES = host-bison host-libsepol \
host-libselinux host-ustr host-bzip2 host-libselinux host-ustr host-bzip2
define HOST_LIBSEMANAGE_BUILD_CMDS define HOST_LIBSEMANAGE_BUILD_CMDS
# DESTDIR is needed during the compile to compute library and # DESTDIR is needed during the compile to compute library and
# header paths. # header paths.
$(MAKE) -C $(@D) all $(HOST_CONFIGURE_OPTS) DESTDIR=$(HOST_DIR) $(MAKE) -C $(@D) $(HOST_CONFIGURE_OPTS) DESTDIR=$(HOST_DIR) all
endef endef
define HOST_LIBSEMANAGE_INSTALL_CMDS 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 endef
$(eval $(generic-package)) $(eval $(generic-package))