From 18a0ac93b678e4f90e3ae739dbe0ba872d3136c2 Mon Sep 17 00:00:00 2001 From: K900 Date: Sun, 6 Jul 2025 10:18:39 +0300 Subject: [PATCH 01/14] system-config-printer: patch to fix build with gettext 0.25 --- pkgs/tools/misc/system-config-printer/default.nix | 3 +++ .../misc/system-config-printer/gettext-0.25.patch | 12 ++++++++++++ 2 files changed, 15 insertions(+) create mode 100644 pkgs/tools/misc/system-config-printer/gettext-0.25.patch diff --git a/pkgs/tools/misc/system-config-printer/default.nix b/pkgs/tools/misc/system-config-printer/default.nix index 5bb9af4aafb3..55c9deff20d3 100644 --- a/pkgs/tools/misc/system-config-printer/default.nix +++ b/pkgs/tools/misc/system-config-printer/default.nix @@ -59,6 +59,9 @@ stdenv.mkDerivation rec { # switch to pep517 build tools ./pep517.patch + + # FIXME: remove when gettext is fixed + ./gettext-0.25.patch ]; buildInputs = [ diff --git a/pkgs/tools/misc/system-config-printer/gettext-0.25.patch b/pkgs/tools/misc/system-config-printer/gettext-0.25.patch new file mode 100644 index 000000000000..fbb1508e4b41 --- /dev/null +++ b/pkgs/tools/misc/system-config-printer/gettext-0.25.patch @@ -0,0 +1,12 @@ +diff --git a/Makefile.am b/Makefile.am +index 9993ca0d..678fa629 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -1,5 +1,7 @@ + SUBDIRS=. po + ++ACLOCAL_AMFLAGS = -I m4 ++ + EXPORT_MODULES= \ + cupshelpers/__init__.py \ + cupshelpers/cupshelpers.py \ From 95cad1d7e7f15c9d281807420045c772bfe45915 Mon Sep 17 00:00:00 2001 From: K900 Date: Sun, 6 Jul 2025 09:39:42 +0300 Subject: [PATCH 02/14] xbindkeys: patch to fix build with gettext 0.25 --- pkgs/by-name/xb/xbindkeys/gettext-0.25.patch | 31 ++++++++++++++++++++ pkgs/by-name/xb/xbindkeys/package.nix | 3 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/by-name/xb/xbindkeys/gettext-0.25.patch diff --git a/pkgs/by-name/xb/xbindkeys/gettext-0.25.patch b/pkgs/by-name/xb/xbindkeys/gettext-0.25.patch new file mode 100644 index 000000000000..01204e341fa3 --- /dev/null +++ b/pkgs/by-name/xb/xbindkeys/gettext-0.25.patch @@ -0,0 +1,31 @@ +diff --git a/Makefile.am b/Makefile.am +index 3257a0a..e39e8bc 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -35,3 +35,5 @@ endif + + + man_MANS = xbindkeys.1 $(man_MANS_TK) ++ ++SUBDIRS = +\ No newline at end of file +diff --git a/configure.ac b/configure.ac +index f039ca8..eb0c886 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -3,10 +3,15 @@ AC_INIT(xbindkeys, 1.8.7, hocwp@free.fr) + AC_PREREQ(2.54) + AC_COPYRIGHT(Copyright (C) Philippe Brochard ) + ++AC_CONFIG_MACRO_DIRS([m4]) ++ + # Automake + AM_INIT_AUTOMAKE() + AM_MAINTAINER_MODE + ++AM_GNU_GETTEXT_VERSION([0.25]) ++AM_GNU_GETTEXT([external]) ++ + AC_CONFIG_SRCDIR([xbindkeys.c]) + AM_CONFIG_HEADER(config.h) + diff --git a/pkgs/by-name/xb/xbindkeys/package.nix b/pkgs/by-name/xb/xbindkeys/package.nix index 1dd877e85d0e..c2d7208bf857 100644 --- a/pkgs/by-name/xb/xbindkeys/package.nix +++ b/pkgs/by-name/xb/xbindkeys/package.nix @@ -16,6 +16,9 @@ stdenv.mkDerivation rec { sha256 = "1wl2vc5alisiwyk8m07y1ryq8w3ll9ym83j27g4apm4ixjl8d6x2"; }; + # FIXME: remove when gettext is fixed + patches = [ ./gettext-0.25.patch ]; + nativeBuildInputs = [ autoreconfHook pkg-config From 31fbe751a733affd2eb9a1221995654b13edf981 Mon Sep 17 00:00:00 2001 From: K900 Date: Sun, 6 Jul 2025 09:44:00 +0300 Subject: [PATCH 03/14] yad: patch to fix build with gettext 0.25 --- pkgs/by-name/ya/yad/gettext-0.25.patch | 18 ++++++++++++++++++ pkgs/by-name/ya/yad/package.nix | 3 +++ 2 files changed, 21 insertions(+) create mode 100644 pkgs/by-name/ya/yad/gettext-0.25.patch diff --git a/pkgs/by-name/ya/yad/gettext-0.25.patch b/pkgs/by-name/ya/yad/gettext-0.25.patch new file mode 100644 index 000000000000..02f551459ef9 --- /dev/null +++ b/pkgs/by-name/ya/yad/gettext-0.25.patch @@ -0,0 +1,18 @@ +diff --git a/configure.ac b/configure.ac +index 20a4e42..921ba18 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -8,9 +8,13 @@ AC_PREREQ([2.59]) + + AC_CONFIG_HEADERS([config.h]) + AC_CONFIG_SRCDIR([src]) ++AC_CONFIG_MACRO_DIRS([m4]) + + AM_MAINTAINER_MODE + ++AM_GNU_GETTEXT_VERSION([0.25]) ++AM_GNU_GETTEXT([external]) ++ + IT_PROG_INTLTOOL([0.40.0]) + + AC_PROG_CC diff --git a/pkgs/by-name/ya/yad/package.nix b/pkgs/by-name/ya/yad/package.nix index 7b1bf736bcd0..18ba4405374c 100644 --- a/pkgs/by-name/ya/yad/package.nix +++ b/pkgs/by-name/ya/yad/package.nix @@ -22,6 +22,9 @@ stdenv.mkDerivation rec { sha256 = "sha256-Y7bp20fkNdSgBcSV1kPEpWEP7ASwZcScVRaPauwI72M="; }; + # FIXME: remove when gettext is fixed + patches = [ ./gettext-0.25.patch ]; + configureFlags = [ "--enable-icon-browser" "--with-gtk=gtk3" From 55c4235d2652e4b860e643bcfbb23673f4468c0b Mon Sep 17 00:00:00 2001 From: K900 Date: Sun, 6 Jul 2025 09:53:00 +0300 Subject: [PATCH 04/14] nix-ld: patch to fix build with Rust 1.88 --- pkgs/by-name/ni/nix-ld/package.nix | 3 +++ pkgs/by-name/ni/nix-ld/rust-1.88.patch | 33 ++++++++++++++++++++++++++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/by-name/ni/nix-ld/rust-1.88.patch diff --git a/pkgs/by-name/ni/nix-ld/package.nix b/pkgs/by-name/ni/nix-ld/package.nix index c53db6681ff0..dd659a0aeebc 100644 --- a/pkgs/by-name/ni/nix-ld/package.nix +++ b/pkgs/by-name/ni/nix-ld/package.nix @@ -17,6 +17,9 @@ rustPlatform.buildRustPackage rec { hash = "sha256-ULoitJD5bMu0pFvh35cY5EEYywxj4e2fYOpqZwKB1lk="; }; + # Submitted upstream: https://github.com/nix-community/nix-ld/pull/169 + patches = [ ./rust-1.88.patch ]; + useFetchCargoVendor = true; cargoHash = "sha256-cDbszVjZcomag0HZvXM+17SjDiGS07iPj78zgsXstHc="; diff --git a/pkgs/by-name/ni/nix-ld/rust-1.88.patch b/pkgs/by-name/ni/nix-ld/rust-1.88.patch new file mode 100644 index 000000000000..dac1fcfa1c8b --- /dev/null +++ b/pkgs/by-name/ni/nix-ld/rust-1.88.patch @@ -0,0 +1,33 @@ +diff --git a/src/arch.rs b/src/arch.rs +index a998697..45ec2cb 100644 +--- a/src/arch.rs ++++ b/src/arch.rs +@@ -140,7 +140,7 @@ cfg_match! { + target_arch = "x86_64" => { + pub const ENTRY_TRAMPOLINE: Option !> = Some(entry_trampoline); + +- #[naked] ++ #[unsafe(naked)] + unsafe extern "C" fn entry_trampoline() -> ! { + core::arch::naked_asm!( + "lea r10, [rip + {context}]", +@@ -159,7 +159,7 @@ cfg_match! { + target_arch = "aarch64" => { + pub const ENTRY_TRAMPOLINE: Option !> = Some(entry_trampoline); + +- #[naked] ++ #[unsafe(naked)] + unsafe extern "C" fn entry_trampoline() -> ! { + core::arch::naked_asm!( + "adrp x8, {context}", +diff --git a/src/sys.rs b/src/sys.rs +index 109d809..bf085d9 100644 +--- a/src/sys.rs ++++ b/src/sys.rs +@@ -181,6 +181,5 @@ pub fn new_slice_leak(size: usize) -> Option<&'static mut [u8]> { + + #[cfg(not(test))] + #[lang = "eh_personality"] +-#[no_mangle] + pub extern fn rust_eh_personality() { + } From 4221cef84596d234efc62996f94bfd0d31a17882 Mon Sep 17 00:00:00 2001 From: K900 Date: Sun, 6 Jul 2025 09:57:44 +0300 Subject: [PATCH 05/14] python313Packages.django-lasuite: 0.0.9 -> 0.0.10 Diff: https://github.com/suitenumerique/django-lasuite/compare/refs/tags/v0.0.9...refs/tags/v0.0.10 Changelog: https://github.com/suitenumerique/django-lasuite/blob/v0.0.10/CHANGELOG.md --- pkgs/development/python-modules/django-lasuite/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django-lasuite/default.nix b/pkgs/development/python-modules/django-lasuite/default.nix index ec0f593ef088..67fbefc9fda6 100644 --- a/pkgs/development/python-modules/django-lasuite/default.nix +++ b/pkgs/development/python-modules/django-lasuite/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "django-lasuite"; - version = "0.0.9"; + version = "0.0.10"; pyproject = true; src = fetchFromGitHub { owner = "suitenumerique"; repo = "django-lasuite"; tag = "v${version}"; - hash = "sha256-vUtWBR9uRc99jTe0Gg7k4EZZAkqHct5+GCOHp1mTIkA="; + hash = "sha256-2rSPGioyG/2VeyBPfsNU4TL2jvlLjRQpxQSl1AHLL10="; }; build-system = [ hatchling ]; From 26f8e78c342cd1af989a32a0bd33f377687eb6bc Mon Sep 17 00:00:00 2001 From: K900 Date: Sun, 6 Jul 2025 10:10:20 +0300 Subject: [PATCH 06/14] webrtc-audio-processing: disable inline SSE on i686 We don't require SSE support so things break. --- pkgs/by-name/we/webrtc-audio-processing/package.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/we/webrtc-audio-processing/package.nix b/pkgs/by-name/we/webrtc-audio-processing/package.nix index eaa6cced2410..03f309134a6d 100644 --- a/pkgs/by-name/we/webrtc-audio-processing/package.nix +++ b/pkgs/by-name/we/webrtc-audio-processing/package.nix @@ -45,7 +45,9 @@ stdenv.mkDerivation (finalAttrs: { abseil-cpp ]; - mesonFlags = lib.lists.optional (!stdenv.hostPlatform.isAarch64) "-Dneon=disabled"; + mesonFlags = + lib.lists.optional (!stdenv.hostPlatform.isAarch64) "-Dneon=disabled" + ++ lib.lists.optional (stdenv.hostPlatform.isi686) "-Dinline-sse=false"; passthru.tests.pkg-config = testers.hasPkgConfigModules { package = finalAttrs.finalPackage; From 01e61b76c5667dbe060432f4c59a80f40235fd8b Mon Sep 17 00:00:00 2001 From: K900 Date: Sun, 6 Jul 2025 10:27:23 +0300 Subject: [PATCH 07/14] jq: refresh i686 patch --- .../jq/jq/disable-end-of-epoch-conversion-test.patch | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/jq/jq/disable-end-of-epoch-conversion-test.patch b/pkgs/by-name/jq/jq/disable-end-of-epoch-conversion-test.patch index 570d443db12f..70917b5cfd29 100644 --- a/pkgs/by-name/jq/jq/disable-end-of-epoch-conversion-test.patch +++ b/pkgs/by-name/jq/jq/disable-end-of-epoch-conversion-test.patch @@ -1,12 +1,11 @@ diff --git a/tests/optional.test b/tests/optional.test -index 2623731..85bc9e9 100644 +index 77354cc..6cc7c12 100644 --- a/tests/optional.test +++ b/tests/optional.test -@@ -12,11 +12,6 @@ last(range(365 * 67)|("1970-03-01T01:02:03Z"|strptime("%Y-%m-%dT%H:%M:%SZ")|mkti - null - [2037,1,11,1,2,3,3,41] +@@ -1,10 +1,5 @@ + # See tests/jq.test and the jq manual for more information. --# Regression test for #3276 +-# Regression test for #3276 (fails on mingw/WIN32) -fromdate -"2038-01-19T03:14:08Z" -2147483648 From 2c91b7b6b8eb9910d5877d9cc270d197b4b2e8db Mon Sep 17 00:00:00 2001 From: K900 Date: Sun, 6 Jul 2025 10:27:33 +0300 Subject: [PATCH 08/14] kdePackages.kimageformats: temporarily disable libavif support --- pkgs/kde/frameworks/kimageformats/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/kde/frameworks/kimageformats/default.nix b/pkgs/kde/frameworks/kimageformats/default.nix index 71e6d884af98..3ec166b8c061 100644 --- a/pkgs/kde/frameworks/kimageformats/default.nix +++ b/pkgs/kde/frameworks/kimageformats/default.nix @@ -15,7 +15,8 @@ mkKdeDerivation { extraBuildInputs = [ libheif libjxl - libavif + # FIXME: cmake files are broken, disabled for now + # libavif libraw openexr ]; From 9fc5cfc3dfb2dac7e53d7bb06707e01f8cb7c535 Mon Sep 17 00:00:00 2001 From: K900 Date: Sun, 6 Jul 2025 10:29:23 +0300 Subject: [PATCH 09/14] python313Packages.geventhttpclient: 2.3.3 -> 2.3.4 Diff: https://github.com/geventhttpclient/geventhttpclient/compare/refs/tags/2.3.3...refs/tags/2.3.4 Changelog: https://github.com/geventhttpclient/geventhttpclient/releases/tag/2.3.4 --- pkgs/development/python-modules/geventhttpclient/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/geventhttpclient/default.nix b/pkgs/development/python-modules/geventhttpclient/default.nix index d3a615957f55..cdcfe2a80f1f 100644 --- a/pkgs/development/python-modules/geventhttpclient/default.nix +++ b/pkgs/development/python-modules/geventhttpclient/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "geventhttpclient"; - version = "2.3.3"; + version = "2.3.4"; pyproject = true; disabled = pythonOlder "3.9"; @@ -26,7 +26,7 @@ buildPythonPackage rec { tag = version; # TODO: unvendor llhttp fetchSubmodules = true; - hash = "sha256-0ltTmF09EKs+55Mitfe5vxPjmCtnhla6q6SAvhyIQPk="; + hash = "sha256-X85co03fMG7OSpkL02n3ektRNzu7oHChtwZzkspsSTk="; }; build-system = [ setuptools ]; From 0e49a8d5a6ebd6d1e3c27c32b42b8979dd2684cf Mon Sep 17 00:00:00 2001 From: K900 Date: Sun, 6 Jul 2025 11:06:17 +0300 Subject: [PATCH 10/14] libqalculate: remove doxygen hack Doesn't actually work, the build system calls it correctly --- pkgs/by-name/li/libqalculate/package.nix | 6 ------ 1 file changed, 6 deletions(-) diff --git a/pkgs/by-name/li/libqalculate/package.nix b/pkgs/by-name/li/libqalculate/package.nix index c665e4bce2bb..28220adbc9a4 100644 --- a/pkgs/by-name/li/libqalculate/package.nix +++ b/pkgs/by-name/li/libqalculate/package.nix @@ -75,12 +75,6 @@ stdenv.mkDerivation (finalAttrs: { --replace-fail '"gnuplot - ' '"${gnuplotBinary} - ' ''; - preBuild = '' - pushd docs/reference - doxygen Doxyfile - popd - ''; - meta = { description = "Advanced calculator library"; homepage = "http://qalculate.github.io"; From 55b0d38442aac04f892f03b6a53cd9bb4c6cfc1c Mon Sep 17 00:00:00 2001 From: K900 Date: Sun, 6 Jul 2025 11:47:57 +0300 Subject: [PATCH 11/14] python313Packages.polars: fix build with Rust 1.88.0 --- .../python-modules/polars/avx512.patch | 15 +++++++++++++++ .../development/python-modules/polars/default.nix | 4 ++++ 2 files changed, 19 insertions(+) create mode 100644 pkgs/development/python-modules/polars/avx512.patch diff --git a/pkgs/development/python-modules/polars/avx512.patch b/pkgs/development/python-modules/polars/avx512.patch new file mode 100644 index 000000000000..5a4d5ecc9530 --- /dev/null +++ b/pkgs/development/python-modules/polars/avx512.patch @@ -0,0 +1,15 @@ +diff --git a/crates/polars-compute/src/lib.rs b/crates/polars-compute/src/lib.rs +index ebe1ef753..6e1eee897 100644 +--- a/crates/polars-compute/src/lib.rs ++++ b/crates/polars-compute/src/lib.rs +@@ -5,6 +5,10 @@ + all(feature = "simd", target_arch = "x86_64"), + feature(stdarch_x86_avx512) + )] ++#![cfg_attr( ++ all(feature = "simd", target_arch = "x86_64"), ++ feature(avx512_target_feature) ++)] + + use arrow::types::NativeType; + diff --git a/pkgs/development/python-modules/polars/default.nix b/pkgs/development/python-modules/polars/default.nix index d5f576e9306f..6b2bf5d213ba 100644 --- a/pkgs/development/python-modules/polars/default.nix +++ b/pkgs/development/python-modules/polars/default.nix @@ -59,6 +59,10 @@ buildPythonPackage rec { hash = "sha256-OZ7guV/uxa3jGesAh+ubrFjQSNVp5ImfXfPAQxagTj0="; }; + patches = [ + ./avx512.patch + ]; + # Do not type-check assertions because some of them use unstable features (`is_none_or`) postPatch = '' while IFS= read -r -d "" path ; do From b5fefecb74f47d028c44e500a7d9edfae1605b45 Mon Sep 17 00:00:00 2001 From: K900 Date: Sun, 6 Jul 2025 11:54:42 +0300 Subject: [PATCH 12/14] python313Packages.scikit-learn: skip tests that assert on specific warnings Scipy update added more warnings, so these tests now fail. Upstream has stopped using deprecated APIs, but it's not in a release yet. --- pkgs/development/python-modules/scikit-learn/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/python-modules/scikit-learn/default.nix b/pkgs/development/python-modules/scikit-learn/default.nix index ac73ec1f4b9c..319d7c71e7f2 100644 --- a/pkgs/development/python-modules/scikit-learn/default.nix +++ b/pkgs/development/python-modules/scikit-learn/default.nix @@ -79,6 +79,12 @@ buildPythonPackage rec { [ # Skip test_feature_importance_regression - does web fetch "test_feature_importance_regression" + + # Fail due to new deprecation warnings in scipy + # FIXME: reenable when fixed upstream + "test_logistic_regression_path_convergence_fail" + "test_linalg_warning_with_newton_solver" + "test_newton_cholesky_fallback_to_lbfgs" ] ++ lib.optionals stdenv.hostPlatform.isAarch64 [ # doesn't seem to produce correct results? From 41d70b192f32f4740287a081711a4b4601746993 Mon Sep 17 00:00:00 2001 From: K900 Date: Sun, 6 Jul 2025 13:12:32 +0300 Subject: [PATCH 13/14] rebar3: don't patchShebangs Fixes building Erlang things. --- pkgs/development/tools/build-managers/rebar3/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/tools/build-managers/rebar3/default.nix b/pkgs/development/tools/build-managers/rebar3/default.nix index 6cfedadca7d8..e40040332bd1 100644 --- a/pkgs/development/tools/build-managers/rebar3/default.nix +++ b/pkgs/development/tools/build-managers/rebar3/default.nix @@ -142,6 +142,9 @@ let # our patches cause the tests to fail doCheck = false; + + # patchShebangs corrupts the magic escript shebang+zip files + dontPatchShebangs = true; }) ); in From 466cedff6cdf7d21613adf2cc248935e64bafa31 Mon Sep 17 00:00:00 2001 From: K900 Date: Sun, 6 Jul 2025 14:02:39 +0300 Subject: [PATCH 14/14] pinentry: update gettext 0.25 fixes to also apply to Linux --- pkgs/tools/security/pinentry/default.nix | 5 ++++- .../security/pinentry/gettext-0.25.patch | 20 +++++++++++++++++-- 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/pinentry/default.nix b/pkgs/tools/security/pinentry/default.nix index 6845cb59c785..b8eaca0fe86c 100644 --- a/pkgs/tools/security/pinentry/default.nix +++ b/pkgs/tools/security/pinentry/default.nix @@ -91,7 +91,10 @@ let dontWrapQtApps = true; patches = - [ ./autoconf-ar.patch ] + [ + ./autoconf-ar.patch + ./gettext-0.25.patch + ] ++ lib.optionals (lib.elem "gtk2" buildFlavors) [ (fetchpatch { url = "https://salsa.debian.org/debian/pinentry/raw/debian/1.1.0-1/debian/patches/0007-gtk2-When-X11-input-grabbing-fails-try-again-over-0..patch"; diff --git a/pkgs/tools/security/pinentry/gettext-0.25.patch b/pkgs/tools/security/pinentry/gettext-0.25.patch index b686d960f4c5..d38289950b2f 100644 --- a/pkgs/tools/security/pinentry/gettext-0.25.patch +++ b/pkgs/tools/security/pinentry/gettext-0.25.patch @@ -1,13 +1,29 @@ diff --git a/configure.ac b/configure.ac -index 1b3ded6..0b78e69 100644 +index 2a9f5d2..a3d9b79 100644 --- a/configure.ac +++ b/configure.ac -@@ -358,6 +358,8 @@ if test "$pinentry_tty" = "yes"; then +@@ -45,6 +45,7 @@ m4_esyscmd([echo ]mym4_version[>VERSION]) + + AC_INIT([mym4_package],[mym4_version],[https://bugs.gnupg.org]) + ++AC_CONFIG_MACRO_DIRS([m4]) + AC_CONFIG_AUX_DIR([build-aux]) + AC_CONFIG_HEADERS([config.h]) + AC_CONFIG_SRCDIR(pinentry/pinentry.h) +@@ -329,13 +330,15 @@ if test "$pinentry_tty" = "yes"; then [The TTY version of Pinentry is to be build]) fi +AM_GNU_GETTEXT_VERSION([0.21]) +AM_GNU_GETTEXT([external]) ++AM_ICONV dnl dnl Additional checks pinentry Curses. + dnl + if test "$pinentry_curses" = "yes" \ + -o "$fallback_curses" = "yes" ; then +- AM_ICONV + if test "$am_cv_func_iconv" != "yes"; then + AC_MSG_ERROR([[ + ***