From 407f53aa074ff9931a1aa57abd90ee9ef29deceb Mon Sep 17 00:00:00 2001 From: heitbaum Date: Mon, 17 Jan 2022 12:37:03 +0000 Subject: [PATCH 1/2] glibc (init): add gconv ANSI_X3 and IBM850 to init image --- packages/devel/glibc/package.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/packages/devel/glibc/package.mk b/packages/devel/glibc/package.mk index 4c9a9c82af..3b56f87a61 100644 --- a/packages/devel/glibc/package.mk +++ b/packages/devel/glibc/package.mk @@ -155,6 +155,12 @@ makeinstall_init() { if [ "${TARGET_ARCH}" = "arm" -a "${TARGET_FLOAT}" = "hard" ]; then ln -sf ld.so ${INSTALL}/usr/lib/ld-linux.so.3 fi + + mkdir -p ${INSTALL}/usr/lib/gconv/gconv-modules.d/ + cp -PR ${PKG_BUILD}/.${TARGET_NAME}/iconvdata/ANSI_X3.110.so ${INSTALL}/usr/lib/gconv + cp -PR ${PKG_BUILD}/.${TARGET_NAME}/iconvdata/IBM850.so ${INSTALL}/usr/lib/gconv + grep IBM850 ${PKG_BUILD}/.${TARGET_NAME}/iconvdata/gconv-modules.d/gconv-modules-extra.conf > \ + ${INSTALL}/usr/lib/gconv/gconv-modules.d/gconv-modules-extra.conf } post_makeinstall_init() { From 113d5f76382ef70520a463f9871c027d44193fc1 Mon Sep 17 00:00:00 2001 From: heitbaum Date: Mon, 17 Jan 2022 12:38:07 +0000 Subject: [PATCH 2/2] dosfstools: add defined -with-iconv to OPTS --- packages/sysutils/dosfstools/package.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/sysutils/dosfstools/package.mk b/packages/sysutils/dosfstools/package.mk index 679c2d0470..7565badbb7 100644 --- a/packages/sysutils/dosfstools/package.mk +++ b/packages/sysutils/dosfstools/package.mk @@ -13,7 +13,7 @@ PKG_DEPENDS_TARGET="toolchain" PKG_DEPENDS_INIT="toolchain dosfstools" PKG_LONGDESC="dosfstools contains utilities for making and checking MS-DOS FAT filesystems." -PKG_CONFIGURE_OPTS_TARGET="--enable-compat-symlinks" +PKG_CONFIGURE_OPTS_TARGET="--enable-compat-symlinks --with-iconv" PKG_MAKE_OPTS_TARGET="PREFIX=/usr" PKG_MAKEINSTALL_OPTS_TARGET="PREFIX=/usr"