From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mout-p-102.mailbox.org (mout-p-102.mailbox.org [IPv6:2001:67c:2050:0:465::102]) by sourceware.org (Postfix) with ESMTPS id CA7F63858D37; Mon, 20 Nov 2023 20:31:58 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org CA7F63858D37 Authentication-Results: sourceware.org; dmarc=pass (p=reject dis=none) header.from=aarsen.me Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=aarsen.me ARC-Filter: OpenARC Filter v1.0.0 sourceware.org CA7F63858D37 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2001:67c:2050:0:465::102 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1700512320; cv=none; b=vzswqFt0gvg6paZcOsuAP5wnY/8O0SUnImvcRcKKxajJgO7E0vxH3zQD5ZndySLvvhKR6sIIJG+/7orYXxx+6k6/MOUEsHPYbNerrdhSW2WIzHiiAslL2c4yrBAz3i8hRTy997RziWSFZKUfpnL/I6a6OToj5eEOLx4Vz0bK3NE= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1700512320; c=relaxed/simple; bh=wSrpygvpQqEYfDAVHi+t79AUuWA1TdbZowOu09sAD2s=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=hQlTLaxt9T+qlnydHzI0KrSlspttQ2qLjxIBWG+3pEacJw6eyeq1JHxQ9m4EUbUZuUXiy/NMeL5g+dDJB7Cld2LdXXUx7+RCuR1v7gYu8GedE6b1gyYC5EWftrotI2l/yG+7ldXymPXjSLbBpOg+GBMWEGVGPfMVB2/4cq5G+ZE= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from smtp102.mailbox.org (smtp102.mailbox.org [IPv6:2001:67c:2050:b231:465::102]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-102.mailbox.org (Postfix) with ESMTPS id 4SYzgv5C3lz9smJ; Mon, 20 Nov 2023 21:31:55 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=aarsen.me; s=MBO0001; t=1700512315; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=wCpZnH981/e8bMLr/EJLQ8fh4ebDWdgNEKkNd36xniQ=; b=Clv4Zl50crjNdWRNtVfiJpaaMWo/gv/kr17ORHEU8F5mrcY7apJ2dku7/583DQUehTTHXX 2Mz0KvhgU6VppqMeVxIGdpnKhC4DRKmInvow+OXlXQwY0noX5s5Hy1InByeexzq5zYHUNX xnN95VNf4o+CMHCiNhtpFxwTaCMcC6FDVpveuohf8dddjME9C7kJZV2ncFdMM3wAvS491i b7m172exCA2YPj0Aw6YCbchr971h+ilP5W/CmC3KEIJimn7PQLUXV6QPx/3GphtB3Pd7Bm fM2WP4QEQxHCvctyd5fn7KDCnMJFc3yo+IjlGbo4GGmr0nc32Uj3UYJ429G5eQ== References: <20230926004300.1716711-2-arsen@aarsen.me> <20230926004300.1716711-3-arsen@aarsen.me> <874jhg2x6p.fsf@adacore.com> From: Arsen =?utf-8?Q?Arsenovi=C4=87?= To: =?utf-8?Q?K=C3=A9vin?= Le Gouguec Cc: gdb-patches@sourceware.org, binutils@sourceware.org, Bruno Haible , Iain Sandoe Subject: Re: [PATCH v2 1/2] *: add modern gettext support Date: Mon, 20 Nov 2023 21:30:24 +0100 In-reply-to: <874jhg2x6p.fsf@adacore.com> Message-ID: <86wmucp3nr.fsf@aarsen.me> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Rspamd-Queue-Id: 4SYzgv5C3lz9smJ X-Spam-Status: No, score=-11.0 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,KAM_INFOUSMEBIZ,RCVD_IN_DNSWL_LOW,SPF_HELO_NONE,SPF_PASS,TXREP,T_SCC_BODY_TEXT_LINE,WEIRD_QUOTING autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable K=C3=A9vin Le Gouguec writes: > Hello! > > Do I understand correctly that this patch, committed as > > 2023-11-15 "Finalized intl-update patches" (862776f26a5) > > specifically the bits quoted below, remove the support for in-tree > libiconv introduced in > > 2015-08-24 "Missing parts of fixes for in-tree libiconv" (cfe101c6a82) > > ? If so, was this intentional? It was not. I did not realize that the in-tree iconv.m4 was modified, and simply updated it. Bruno, should these modifications just be restored, or do you think there's some preferable way to add sibling libiconv discovery? I am fine with either. > Arsen Arsenovi=C4=87 writes: > >> [=E2=80=A6] >> config/ChangeLog: >> >> * intlmacosx.m4: Import from gettext-0.22 (serial 8). >> * gettext.m4: Sync with gettext-0.22 (serial 77). >> * gettext-sister.m4 (ZW_GNU_GETTEXT_SISTER_DIR): Load gettext's >> uninstalled-config.sh, or call AM_GNU_GETTEXT if missing. >> * iconv.m4: Sync with gettext-0.22 (serial 26). >> [=E2=80=A6] >> diff --git a/config/iconv.m4 b/config/iconv.m4 >> index f1e54c5aedc..ff5d5261139 100644 >> --- a/config/iconv.m4 >> +++ b/config/iconv.m4 >> [=E2=80=A6] >> - CPPFLAGS=3D"$am_save_CPPFLAGS" >> - >> - if test "$am_cv_func_iconv" !=3D yes && test -d ../libiconv; then >> - for _libs in .libs _libs; do >> - am_save_CPPFLAGS=3D"$CPPFLAGS" >> - am_save_LIBS=3D"$LIBS" >> - CPPFLAGS=3D"$CPPFLAGS -I../libiconv/include" >> - LIBS=3D"$LIBS ../libiconv/lib/$_libs/libiconv.a" >> - AC_TRY_LINK([#include >> -#include ], >> - [iconv_t cd =3D iconv_open("",""); >> + AC_LINK_IFELSE( >> + [AC_LANG_PROGRAM( >> + [[ >> +#include >> +#include >> + ]], >> + [[iconv_t cd =3D iconv_open("",""); >> iconv(cd,NULL,NULL,NULL,NULL); >> - iconv_close(cd);], >> - INCICONV=3D"-I../libiconv/include" >> - LIBICONV=3D'${top_builddir}'/../libiconv/lib/$_libs/libiconv.a >> - LTLIBICONV=3D'${top_builddir}'/../libiconv/lib/libiconv.la >> - am_cv_lib_iconv=3Dyes >> - am_cv_func_iconv=3Dyes) >> - CPPFLAGS=3D"$am_save_CPPFLAGS" >> - LIBS=3D"$am_save_LIBS" >> - if test "$am_cv_func_iconv" =3D "yes"; then >> - break >> - fi >> - done >> - fi >> - >> [=E2=80=A6] =2D-=20 Arsen Arsenovi=C4=87 --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iOYEARYKAI4WIQT+4rPRE/wAoxYtYGFSwpQwHqLEkwUCZVvCOF8UgAAAAAAuAChp c3N1ZXItZnByQG5vdGF0aW9ucy5vcGVucGdwLmZpZnRoaG9yc2VtYW4ubmV0RkVF MkIzRDExM0ZDMDBBMzE2MkQ2MDYxNTJDMjk0MzAxRUEyQzQ5MxAcYXJzZW5AYWFy c2VuLm1lAAoJEFLClDAeosSTjMYA/iupKySA8r5xd9LHVpeWXsfUXe75BgmW3D0H WGFyxURXAQCD7IaLNDq7+TEUerLRVPULzkyoWNZ+53j2UFwxKzKNAw== =eB9r -----END PGP SIGNATURE----- --=-=-=--