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

toolchain/toolchain.mk: fix code style

Browse Source 
Rearrange the header of the .mk file so it becomes similar to a header
from a package. It doesn't fit in one line, so split the details to a
comment below the header.

GCONV_LIBS is only used inside this file, so rename it to start with
TOOLCHAIN_, following the namespace convention already used by packages.

Rename the hook COPY_GCONV_LIBS to TOOLCHAIN_GLIBC_COPY_GCONV_LIBS
following the convention used for hooks in packages.

Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
Cc: Thomas De Schampheleire <thomas.de_schampheleire@nokia.com>
Cc: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
Ricardo Martincoski 2018-04-01 02:08:28 -03:00 committed by Thomas Petazzoni
parent b17e5b2d58
commit d0837c0a14
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
toolchain/toolchain.mk
View File

@ -1,7 +1,11 @@
# This file contains toolchain-related customisation of the content ################################################################################
# of the target/ directory. Those customisations are added to the #
# TARGET_FINALIZE_HOOKS, to be applied just after all packages # toolchain-related customisation of the content of the target/ directory
# have been built. #
################################################################################
# Those customisations are added to the TARGET_FINALIZE_HOOKS, to be applied
# just after all packages have been built.
# Install default nsswitch.conf file if the skeleton doesn't provide it # Install default nsswitch.conf file if the skeleton doesn't provide it
ifeq ($(BR2_TOOLCHAIN_USES_GLIBC),y) ifeq ($(BR2_TOOLCHAIN_USES_GLIBC),y)
@ -15,8 +19,8 @@ endif
# Install the gconv modules # Install the gconv modules
ifeq ($(BR2_TOOLCHAIN_GLIBC_GCONV_LIBS_COPY),y) ifeq ($(BR2_TOOLCHAIN_GLIBC_GCONV_LIBS_COPY),y)
GCONV_LIBS = $(call qstrip,$(BR2_TOOLCHAIN_GLIBC_GCONV_LIBS_LIST)) TOOLCHAIN_GLIBC_GCONV_LIBS = $(call qstrip,$(BR2_TOOLCHAIN_GLIBC_GCONV_LIBS_LIST))
define COPY_GCONV_LIBS define TOOLCHAIN_GLIBC_COPY_GCONV_LIBS
$(Q)found_gconv=no; \ $(Q)found_gconv=no; \
for d in $(TOOLCHAIN_EXTERNAL_PREFIX) ''; do \ for d in $(TOOLCHAIN_EXTERNAL_PREFIX) ''; do \
[ -d "$(STAGING_DIR)/usr/lib/$${d}/gconv" ] || continue; \ [ -d "$(STAGING_DIR)/usr/lib/$${d}/gconv" ] || continue; \
@ -27,14 +31,14 @@ define COPY_GCONV_LIBS
printf "Unable to find gconv modules\n" >&2; \ printf "Unable to find gconv modules\n" >&2; \
exit 1; \ exit 1; \
fi; \ fi; \
if [ -z "$(GCONV_LIBS)" ]; then \ if [ -z "$(TOOLCHAIN_GLIBC_GCONV_LIBS)" ]; then \
$(INSTALL) -m 0644 -D $(STAGING_DIR)/usr/lib/$${d}/gconv/gconv-modules \ $(INSTALL) -m 0644 -D $(STAGING_DIR)/usr/lib/$${d}/gconv/gconv-modules \
$(TARGET_DIR)/usr/lib/gconv/gconv-modules && \ $(TARGET_DIR)/usr/lib/gconv/gconv-modules && \
$(INSTALL) -m 0644 $(STAGING_DIR)/usr/lib/$${d}/gconv/*.so \ $(INSTALL) -m 0644 $(STAGING_DIR)/usr/lib/$${d}/gconv/*.so \
$(TARGET_DIR)/usr/lib/gconv \ $(TARGET_DIR)/usr/lib/gconv \
|| exit 1; \ || exit 1; \
else \ else \
for l in $(GCONV_LIBS); do \ for l in $(TOOLCHAIN_GLIBC_GCONV_LIBS); do \
$(INSTALL) -m 0644 -D $(STAGING_DIR)/usr/lib/$${d}/gconv/$${l}.so \ $(INSTALL) -m 0644 -D $(STAGING_DIR)/usr/lib/$${d}/gconv/$${l}.so \
$(TARGET_DIR)/usr/lib/gconv/$${l}.so \ $(TARGET_DIR)/usr/lib/gconv/$${l}.so \
|| exit 1; \ || exit 1; \
@ -47,10 +51,10 @@ define COPY_GCONV_LIBS
|| exit 1; \ || exit 1; \
done; \ done; \
done; \ done; \
./support/scripts/expunge-gconv-modules "$(GCONV_LIBS)" \ ./support/scripts/expunge-gconv-modules "$(TOOLCHAIN_GLIBC_GCONV_LIBS)" \
<$(STAGING_DIR)/usr/lib/$${d}/gconv/gconv-modules \ <$(STAGING_DIR)/usr/lib/$${d}/gconv/gconv-modules \
>$(TARGET_DIR)/usr/lib/gconv/gconv-modules; \ >$(TARGET_DIR)/usr/lib/gconv/gconv-modules; \
fi fi
endef endef
TOOLCHAIN_TARGET_FINALIZE_HOOKS += COPY_GCONV_LIBS TOOLCHAIN_TARGET_FINALIZE_HOOKS += TOOLCHAIN_GLIBC_COPY_GCONV_LIBS
endif endif