From baf02b1511351695ab7d2ad959964e286cc5a56b Mon Sep 17 00:00:00 2001 From: LucĂ­a Andrea Illanes Albornoz Date: Dec 26 2022 13:53:42 +0000 Subject: groups/030.host_toolchain.group:musl_full_host:${PKG_INSTALL_FILES_V2}: delete non-GNU include/iconv.h. groups/030.host_toolchain.group:musl_no_complex_host:${PKG_INSTALL_FILES_V2}: delete non-GNU include/iconv.h. groups/110.native_toolchain.group:musl_full:${PKG_INSTALL_FILES_V2}: delete non-GNU include/iconv.h. --- diff --git a/groups/030.host_toolchain.group b/groups/030.host_toolchain.group index c721d7d..9f0da0d 100644 --- a/groups/030.host_toolchain.group +++ b/groups/030.host_toolchain.group @@ -115,6 +115,7 @@ HOST_TOOLCHAIN_RPM_DISABLE=1; : ${PKG_MUSL_FULL_HOST_BUILD_TYPE:=cross}; : ${PKG_MUSL_FULL_HOST_CONFIGURE:=build/mmglue/configure}; : ${PKG_MUSL_FULL_HOST_CONFIGURE_ARGS:="--source-dir=../../musl-${PKG_MUSL_FULL_HOST_VERSION} --prefix= --target=${DEFAULT_TARGET} --sysroot=${PREFIX_CROSS}"}; +: ${PKG_MUSL_FULL_HOST_INSTALL_FILES_V2:="-=include/iconv.h"}; : ${PKG_MUSL_FULL_HOST_SUBDIR:=musl-${PKG_MUSL_FULL_HOST_VERSION}}; : ${PKG_MUSL_FULL_HOST_VARS_FILE:="vars/musl.vars"}; : ${PKG_MUSL_NO_COMPLEX_HOST_DEPENDS:="gcc_stage1_host"}; @@ -127,6 +128,7 @@ HOST_TOOLCHAIN_RPM_DISABLE=1; : ${PKG_MUSL_NO_COMPLEX_HOST_BUILD_TYPE:=cross}; : ${PKG_MUSL_NO_COMPLEX_HOST_CONFIGURE:=build/mmglue/configure}; : ${PKG_MUSL_NO_COMPLEX_HOST_CONFIGURE_ARGS:="--source-dir=../../musl-${PKG_MUSL_NO_COMPLEX_HOST_VERSION} --no-complex --prefix= --target=${DEFAULT_TARGET} --sysroot=${PREFIX_CROSS}"}; +: ${PKG_MUSL_NO_COMPLEX_HOST_INSTALL_FILES_V2:="-=include/iconv.h"}; : ${PKG_MUSL_NO_COMPLEX_HOST_SUBDIR:=musl-${PKG_MUSL_NO_COMPLEX_HOST_VERSION}}; : ${PKG_MUSL_NO_COMPLEX_HOST_VARS_FILE:="vars/musl.vars"}; : ${PKG_NASM_HOST_SHA256SUM:=e24ade3e928f7253aa8c14aa44726d1edf3f98643f87c9d72ec1df44b26be8f5}; diff --git a/groups/110.native_toolchain.group b/groups/110.native_toolchain.group index 9fcbe96..7713e01 100644 --- a/groups/110.native_toolchain.group +++ b/groups/110.native_toolchain.group @@ -68,6 +68,7 @@ NATIVE_TOOLCHAIN_PREFIX="${PREFIX_NATIVE}"; : ${PKG_MUSL_FULL_BUILD_DIR:=build/musl}; : ${PKG_MUSL_FULL_CONFIGURE:=build/mmglue/configure}; : ${PKG_MUSL_FULL_CONFIGURE_ARGS:="--source-dir=../../musl-${PKG_MUSL_FULL_VERSION} --prefix= --target=${DEFAULT_TARGET} --sysroot=${PREFIX_CROSS}"}; +: ${PKG_MUSL_FULL_INSTALL_FILES_V2:="-=include/iconv.h"}; : ${PKG_MUSL_FULL_SUBDIR:=musl-${PKG_MUSL_FULL_VERSION}}; : ${PKG_MUSL_FULL_VARS_FILE:="vars/musl.vars"};