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

libselinux: adjust build of Python bindings

Browse Source 
In order to work-around dependency issues, the Python bindings should be
built though a separate make invocation from the rest of the
library. This avoids build issues like this:

selinux_restorecon.lo: file not recognized: File truncated
[...]
collect2: error: ld returned 1 exit status
make[2]: *** [libselinux.so.1] Error 1

Fixes:

  http://autobuild.buildroot.net/results/967b74d0ae5b4b83ea2729217b005a3e1e4514d0/

Signed-off-by: Matthew Weber <matthew.weber@rockwellcollins.com>
[Thomas: improve commit log.]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
Matt Weber 2017-04-12 23:16:12 -05:00 committed by Thomas Petazzoni
parent 710a47d322
commit c160a3ca4c
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
package/libselinux/libselinux.mk
View File

@ -20,7 +20,6 @@ LIBSELINUX_MAKE_OPTS = \
LDFLAGS="$(TARGET_LDFLAGS) -lpcre -lpthread" \ LDFLAGS="$(TARGET_LDFLAGS) -lpcre -lpthread" \
ARCH=$(KERNEL_ARCH) ARCH=$(KERNEL_ARCH)
LIBSELINUX_MAKE_TARGETS = all
LIBSELINUX_MAKE_INSTALL_TARGETS = install LIBSELINUX_MAKE_INSTALL_TARGETS = install
ifeq ($(BR2_PACKAGE_PYTHON)$(BR2_PACKAGE_PYTHON3),y) ifeq ($(BR2_PACKAGE_PYTHON)$(BR2_PACKAGE_PYTHON3),y)
@ -39,16 +38,23 @@ LIBSELINUX_MAKE_OPTS += \
PYSITEDIR=$(TARGET_DIR)/usr/lib/$(LIBSELINUX_PYLIBVER)/site-packages \ PYSITEDIR=$(TARGET_DIR)/usr/lib/$(LIBSELINUX_PYLIBVER)/site-packages \
SWIG_LIB="$(HOST_DIR)/usr/share/swig/$(SWIG_VERSION)/" SWIG_LIB="$(HOST_DIR)/usr/share/swig/$(SWIG_VERSION)/"
LIBSELINUX_MAKE_TARGETS += swigify pywrap
LIBSELINUX_MAKE_INSTALL_TARGETS += install-pywrap LIBSELINUX_MAKE_INSTALL_TARGETS += install-pywrap
# dependencies are broken and result in file truncation errors at link
# time if the Python bindings are built through the same make
# invocation as the rest of the library.
define LIBSELINUX_BUILD_PYTHON_BINDINGS
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \
$(LIBSELINUX_MAKE_OPTS) DESTDIR=$(STAGING_DIR) swigify pywrap
endef
endif # python || python3 endif # python || python3
define LIBSELINUX_BUILD_CMDS define LIBSELINUX_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.
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \ $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \
$(LIBSELINUX_MAKE_OPTS) DESTDIR=$(STAGING_DIR) \ $(LIBSELINUX_MAKE_OPTS) DESTDIR=$(STAGING_DIR) all
$(LIBSELINUX_MAKE_TARGETS) $(LIBSELINUX_BUILD_PYTHON_BINDINGS)
endef endef
define LIBSELINUX_INSTALL_STAGING_CMDS define LIBSELINUX_INSTALL_STAGING_CMDS