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

toolchain/toolchain: set TOOLCHAIN_INSTALL_STAGING only once

Browse Source 
Currently, we set TOOLCHAIN_INSTALL_STAGING three times: once
(conditionally) in toolchain.mk, and once each (unconditionally) in
pkg-cmake.mk and pkg-meson.mk.

This is a little bit messy... Set it just once, unconditionally, in
toolchain.mk where it belongs.

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
Arnout Vandecappelle (Essensium/Mind) 2019-10-27 14:37:56 +01:00 committed by Thomas Petazzoni
parent d4d4056e63
commit 212adf32f3
3 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
package/pkg-cmake.mk
View File

@ -272,4 +272,3 @@ define TOOLCHAIN_CMAKE_INSTALL_FILES
endef endef
TOOLCHAIN_POST_INSTALL_STAGING_HOOKS += TOOLCHAIN_CMAKE_INSTALL_FILES TOOLCHAIN_POST_INSTALL_STAGING_HOOKS += TOOLCHAIN_CMAKE_INSTALL_FILES
TOOLCHAIN_INSTALL_STAGING = YES

1
package/pkg-meson.mk
View File

@ -206,4 +206,3 @@ define PKG_MESON_INSTALL_CROSS_CONF
endef endef
TOOLCHAIN_POST_INSTALL_STAGING_HOOKS += HOST_MESON_INSTALL_CROSS_CONF TOOLCHAIN_POST_INSTALL_STAGING_HOOKS += HOST_MESON_INSTALL_CROSS_CONF
TOOLCHAIN_INSTALL_STAGING = YES

2
toolchain/toolchain/toolchain.mk
View File

@ -11,6 +11,7 @@ TOOLCHAIN_DEPENDENCIES += toolchain-external
endif endif
TOOLCHAIN_ADD_TOOLCHAIN_DEPENDENCY = NO TOOLCHAIN_ADD_TOOLCHAIN_DEPENDENCY = NO
TOOLCHAIN_INSTALL_STAGING = YES
# Apply a hack that Rick Felker suggested[1] to avoid conflicts between libc # Apply a hack that Rick Felker suggested[1] to avoid conflicts between libc
# headers and kernel headers. This is needed for kernel headers older than # headers and kernel headers. This is needed for kernel headers older than
@ -34,7 +35,6 @@ define TOOLCHAIN_MUSL_KERNEL_HEADERS_COMPATIBILITY_HACK
$(STAGING_DIR)/usr/include/linux/libc-compat.h $(STAGING_DIR)/usr/include/linux/libc-compat.h
endef endef
TOOLCHAIN_POST_INSTALL_STAGING_HOOKS += TOOLCHAIN_MUSL_KERNEL_HEADERS_COMPATIBILITY_HACK TOOLCHAIN_POST_INSTALL_STAGING_HOOKS += TOOLCHAIN_MUSL_KERNEL_HEADERS_COMPATIBILITY_HACK
TOOLCHAIN_INSTALL_STAGING = YES
endif endif
# Install default nsswitch.conf file if the skeleton doesn't provide it # Install default nsswitch.conf file if the skeleton doesn't provide it