|
@@ -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
|
|
|
|
-# have been built.
|
|
|
|
|
|
+################################################################################
|
|
|
|
+#
|
|
|
|
+# 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 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))
|
|
|
|
-define COPY_GCONV_LIBS
|
|
|
|
|
|
+TOOLCHAIN_GLIBC_GCONV_LIBS = $(call qstrip,$(BR2_TOOLCHAIN_GLIBC_GCONV_LIBS_LIST))
|
|
|
|
+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
|