Merge pull request #6160 from CvH/11.0/revert

reverts #6152
This commit is contained in:
Matthias Reichl 2022-01-23 18:37:38 +01:00 committed by GitHub
commit cef9573d6c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 7 deletions

View File

@ -155,12 +155,6 @@ 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() {

View File

@ -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 --with-iconv"
PKG_CONFIGURE_OPTS_TARGET="--enable-compat-symlinks"
PKG_MAKE_OPTS_TARGET="PREFIX=/usr"
PKG_MAKEINSTALL_OPTS_TARGET="PREFIX=/usr"