From fd2fef6672e8afed796332544180857c4aefa31b Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Thu, 16 Jul 2026 13:05:50 -0600 Subject: [PATCH] cosmic-{edit,files,monitor,term}: do not manually link libiconv for i586 and riscv64gc --- recipes/cosmic/cosmic-edit/recipe.toml | 5 ----- recipes/cosmic/cosmic-files/recipe.toml | 5 ----- recipes/cosmic/cosmic-monitor/recipe.toml | 5 ----- recipes/cosmic/cosmic-term/recipe.toml | 5 ----- 4 files changed, 20 deletions(-) diff --git a/recipes/cosmic/cosmic-edit/recipe.toml b/recipes/cosmic/cosmic-edit/recipe.toml index e2344dbdf..2dccf690c 100644 --- a/recipes/cosmic/cosmic-edit/recipe.toml +++ b/recipes/cosmic/cosmic-edit/recipe.toml @@ -10,11 +10,6 @@ dependencies = [ script = """ DYNAMIC_INIT export GETTEXT_DIR="${COOKBOOK_SYSROOT}/usr" -if [ "${COOKBOOK_DYNAMIC}" != "1" ] -then - # Statically linked i586 and riscv64gc need libiconv manually linked - export RUSTFLAGS="${RUSTFLAGS} -liconv" -fi cookbook_cargo --no-default-features mkdir -pv "${COOKBOOK_STAGE}/usr/share/ui/apps" diff --git a/recipes/cosmic/cosmic-files/recipe.toml b/recipes/cosmic/cosmic-files/recipe.toml index 2f5266f10..4551247c0 100644 --- a/recipes/cosmic/cosmic-files/recipe.toml +++ b/recipes/cosmic/cosmic-files/recipe.toml @@ -10,11 +10,6 @@ dependencies = [ script = """ DYNAMIC_INIT export GETTEXT_DIR="${COOKBOOK_SYSROOT}/usr" -if [ "${COOKBOOK_DYNAMIC}" != "1" ] -then - # Statically linked i586 and riscv64gc need libiconv manually linked - export RUSTFLAGS="${RUSTFLAGS} -liconv" -fi cookbook_cargo --no-default-features mkdir -pv "${COOKBOOK_STAGE}/usr/share/ui/apps/" diff --git a/recipes/cosmic/cosmic-monitor/recipe.toml b/recipes/cosmic/cosmic-monitor/recipe.toml index 11332fdf6..f87a068c8 100644 --- a/recipes/cosmic/cosmic-monitor/recipe.toml +++ b/recipes/cosmic/cosmic-monitor/recipe.toml @@ -11,11 +11,6 @@ dependencies = [ script = """ DYNAMIC_INIT export GETTEXT_DIR="${COOKBOOK_SYSROOT}/usr" -if [ "${COOKBOOK_DYNAMIC}" != "1" ] -then - # Statically linked i586 and riscv64gc need libiconv manually linked - export RUSTFLAGS="${RUSTFLAGS} -liconv" -fi cookbook_cargo --no-default-features #TODO: install with just? diff --git a/recipes/cosmic/cosmic-term/recipe.toml b/recipes/cosmic/cosmic-term/recipe.toml index 67c5fc0d0..6fdacbf11 100644 --- a/recipes/cosmic/cosmic-term/recipe.toml +++ b/recipes/cosmic/cosmic-term/recipe.toml @@ -10,11 +10,6 @@ dependencies = [ script = """ DYNAMIC_INIT export GETTEXT_DIR="${COOKBOOK_SYSROOT}/usr" -if [ "${COOKBOOK_DYNAMIC}" != "1" ] -then - # Statically linked i586 and riscv64gc need libiconv manually linked - export RUSTFLAGS="${RUSTFLAGS} -liconv" -fi cookbook_cargo --no-default-features mkdir -pv "${COOKBOOK_STAGE}/usr/share/ui/apps"