a181d5de36
nsswitch.conf is processed both by the toolchain, nss-mdns and nss-myhostname without any guaranteed ordering in between. The toolchain package ensures that nsswitch.conf is available, and the two nss-* packages tweaks the content, so the toolchain processing should run before the nss-* ones. Toolchain is a dependency of all the packages, so ensure this is done by moving the toolchain handling to a post-target-install hook. Also move the variable to toolchain/toolchain/toolchain.mk where the virtual toolchain package is defined for clarity. Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
51 lines
1.9 KiB
Makefile
51 lines
1.9 KiB
Makefile
################################################################################
|
|
#
|
|
# 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 have been built.
|
|
|
|
# Install the gconv modules
|
|
ifeq ($(BR2_TOOLCHAIN_GLIBC_GCONV_LIBS_COPY),y)
|
|
TOOLCHAIN_GLIBC_GCONV_LIBS = $(call qstrip,$(BR2_TOOLCHAIN_GLIBC_GCONV_LIBS_LIST))
|
|
define TOOLCHAIN_GLIBC_COPY_GCONV_LIBS
|
|
$(Q)found_gconv=no; \
|
|
for d in $(TOOLCHAIN_EXTERNAL_PREFIX) ''; do \
|
|
[ -d "$(STAGING_DIR)/usr/lib/$${d}/gconv" ] || continue; \
|
|
found_gconv=yes; \
|
|
break; \
|
|
done; \
|
|
if [ "$${found_gconv}" = "no" ]; then \
|
|
printf "Unable to find gconv modules\n" >&2; \
|
|
exit 1; \
|
|
fi; \
|
|
if [ -z "$(TOOLCHAIN_GLIBC_GCONV_LIBS)" ]; then \
|
|
$(INSTALL) -m 0644 -D $(STAGING_DIR)/usr/lib/$${d}/gconv/gconv-modules \
|
|
$(TARGET_DIR)/usr/lib/gconv/gconv-modules && \
|
|
$(INSTALL) -m 0644 $(STAGING_DIR)/usr/lib/$${d}/gconv/*.so \
|
|
$(TARGET_DIR)/usr/lib/gconv \
|
|
|| exit 1; \
|
|
else \
|
|
for l in $(TOOLCHAIN_GLIBC_GCONV_LIBS); do \
|
|
$(INSTALL) -m 0644 -D $(STAGING_DIR)/usr/lib/$${d}/gconv/$${l}.so \
|
|
$(TARGET_DIR)/usr/lib/gconv/$${l}.so \
|
|
|| exit 1; \
|
|
$(TARGET_READELF) -d $(STAGING_DIR)/usr/lib/$${d}/gconv/$${l}.so |\
|
|
sort -u |\
|
|
sed -e '/.*(NEEDED).*\[\(.*\.so\)\]$$/!d; s//\1/;' |\
|
|
while read lib; do \
|
|
$(INSTALL) -m 0644 -D $(STAGING_DIR)/usr/lib/$${d}/gconv/$${lib} \
|
|
$(TARGET_DIR)/usr/lib/gconv/$${lib} \
|
|
|| exit 1; \
|
|
done; \
|
|
done; \
|
|
./support/scripts/expunge-gconv-modules "$(TOOLCHAIN_GLIBC_GCONV_LIBS)" \
|
|
<$(STAGING_DIR)/usr/lib/$${d}/gconv/gconv-modules \
|
|
>$(TARGET_DIR)/usr/lib/gconv/gconv-modules; \
|
|
fi
|
|
endef
|
|
TOOLCHAIN_TARGET_FINALIZE_HOOKS += TOOLCHAIN_GLIBC_COPY_GCONV_LIBS
|
|
endif
|