From patchwork Wed Dec 7 05:03:01 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Ziemowit Laski X-Patchwork-Id: 2094 Return-Path: Delivered-To: patchwork@archlinux.org Received: from mail.archlinux.org [2a01:4f9:c010:3052::1] by patchwork.archlinux.org with IMAP (fetchmail-6.4.34) for (single-drop); Wed, 07 Dec 2022 05:03:19 +0000 (UTC) Received: from mail.archlinux.org by mail.archlinux.org with LMTP id KFmDEpcekGOI2QEAK+/4rw (envelope-from ) for ; Wed, 07 Dec 2022 05:03:19 +0000 Received: from lists.archlinux.org (lists.archlinux.org [95.217.236.249]) (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 mail.archlinux.org (Postfix) with ESMTPS id 618A3177CE75; Wed, 7 Dec 2022 05:03:16 +0000 (UTC) Authentication-Results: mail.archlinux.org; dkim=fail ("body hash did not verify") header.d=ziemas.net header.s=selector1 header.b=gdK0dUub; dmarc=fail reason="SPF not aligned (relaxed)" header.from=ziemas.net (policy=quarantine); arc=reject ("signature check failed: fail, {[1] = sig:microsoft.com:reject}"); spf=pass (mail.archlinux.org: domain of pacman-dev-bounces@lists.archlinux.org designates 95.217.236.249 as permitted sender) smtp.mailfrom=pacman-dev-bounces@lists.archlinux.org Received: from lists.archlinux.org (localhost [IPv6:::1]) by lists.archlinux.org (Postfix) with ESMTP id 041AD6DF5F0; Wed, 7 Dec 2022 05:03:13 +0000 (UTC) Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2100.outbound.protection.outlook.com [40.107.236.100]) by lists.archlinux.org (Postfix) with ESMTPS id 9E55C6DF5E7 for ; Wed, 7 Dec 2022 05:03:05 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=a6mp+z3XQcRxCD380jn+kQJt0fUe33aXsIWRZ6CkJDvP2mmclgDfsNitN9q5heVxODLcJzWj3nkeyQbkETcwaZttWNgzfNQ4FspTnJebkTH8KkaaVYns46DyFDvJ1E6yfjn/D0m7tMLZWAgexefNT2hEFTMI0kmr0cN7xBBX8964qI+YWeAicyOoTbyy8iebwxZzwmds3cNzEJNt50ny6O2n6CQJ6+YKYz+sts6412WiVCPOqx8s7NdH0hNCh9JrkThg/B8/vd4isE8t4iGCdCrFPQstdcYXCKaKtKYH5WtBmmxq+zwekDkcAQfMIBJLqnBMMAhQpSUESKPoG2AecQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=LDB18UgQvTWr/X6crrxtSoSy8gK1PlegVfPx5hx6bQg=; b=BuKgrmkLYzI2StfeALNYFE6mYu45qA4j6GC4xjCZZ0IHhUHPvJFZ2w9f6bkliUQ4fcrgYFnTn3+NnLS78pfzvwX020vw9qlVujCAJKoPLyRIadG44ZO7gMqFNIDyl06yzPRvaH3lZ/MbgLyGl1/+dNQb28/FDh5yRN4xjoKxMlmOLJJoBJf1gCNGnDWv8RTnxOhGAQF75ypSLwHtYWkNH4kU+9M/Bfn14wIcLOdzxz78D/FzwNvAJyLlpR40Bt4eRicgAcRhSATJS3E9a3471bvVq2FxsHhz5dvX5tvqwlpwZeH5tl5FtectN69UPFnCJeMqlmrjjUbbhIKQrxQ1NQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=ziemas.net; dmarc=pass action=none header.from=ziemas.net; dkim=pass header.d=ziemas.net; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ziemas.net; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=LDB18UgQvTWr/X6crrxtSoSy8gK1PlegVfPx5hx6bQg=; b=gdK0dUubDe3eu0M02xgUIYXN5GtSuCLupEO921gaED0+PsfEg5+K1gO+76BQzLW8bATRdqCOSS3bg0ufL5f3IYzzAdGu28+lzxZ6/+Qc4zvRne4xERYl5j1xrk1uxvbXE5VD6K2bQ9HHSa8SuDxxlZ/4Ynp+KqU8yQe3r4CGP6g= Received: from BYAPR12MB3238.namprd12.prod.outlook.com (2603:10b6:a03:13b::20) by SN7PR12MB7108.namprd12.prod.outlook.com (2603:10b6:806:2a3::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5880.14; Wed, 7 Dec 2022 05:03:01 +0000 Received: from BYAPR12MB3238.namprd12.prod.outlook.com ([fe80::ae11:4ef5:f583:331a]) by BYAPR12MB3238.namprd12.prod.outlook.com ([fe80::ae11:4ef5:f583:331a%4]) with mapi id 15.20.5880.014; Wed, 7 Dec 2022 05:03:01 +0000 From: Ziemowit Laski To: "pacman-dev@lists.archlinux.org" Subject: Fix issues with libintl and libgpgme during builds Thread-Topic: Fix issues with libintl and libgpgme during builds Thread-Index: AdkJ9tUM4KHvgXIqS9+QPfBHDIUxkg== Date: Wed, 7 Dec 2022 05:03:01 +0000 Message-ID: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-publictraffictype: Email x-ms-traffictypediagnostic: BYAPR12MB3238:EE_|SN7PR12MB7108:EE_ x-ms-office365-filtering-correlation-id: 09855ae7-8ecf-40b5-c607-08dad81050da x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: 2OA3qcbupsMEyG07ufxw/H34mqfkPrlZyN8m2O+n/S400mqF+jIL/ZQOdfV4AsEONQ+kJxHJtNCnAIYb1gF/Brf4K+Qj7BBtVridBOCVRF4R5sgdzsx/o2bg2uHZycNn2TP+W1OslbN2M8pmQ+qm16QylO6+X/SXx5Vf52A/pGm9jf69cpvfWYL8mXuNkofFFxKb8Y6GE7hTYF0pIYHRUHYbE2q3H3fVzIcDCg0jK/jeRawajuTAb18M3J6i5LR7EiuUiKPnjb0Y5TaKK6zw9rcdnPYI+NP2MOhjKzkdiTMMsSyoSNfmWhAARi0awf72nMsoyWtBa+QgV9JRHViJSCs8XYicZX3PHUG7XgJQb6H+Y4+3OQ23KfLdPdmU9YVhZl7MynhqkeK3j+YlTflalpmpLBX4VmqQsN5CcbFrJijwfWG+tUg0xgUNMfzBWTfcO6N2RQGPozahuc+H5U7HsASjcKEM7StZSR9LpwxiecojPM1vk9N1i2rvSMjf2p+/jxn4pGUtWMER9aNlrp5UJ6GfLtwj+yC63XtkhuLJAmjtQ2pMt9R9t7yhKvYJcb5gKfJ1M5Urx80Iu8pi2un3WLRsuU3QkHfOE8oGEmWEK3nTtnGIvgFF/KfuO3Kq0ReeSsvNOMzI2oLNL9Df+X1H9tHD2OKuBaRKupHiNYBsPOxbrgMo27f0y4PLIdmS4q4o x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BYAPR12MB3238.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230022)(346002)(136003)(396003)(39830400003)(366004)(376002)(451199015)(7696005)(6506007)(83380400001)(38070700005)(9686003)(71200400001)(2906002)(86362001)(6916009)(26005)(186003)(41300700001)(316002)(53546011)(5660300002)(76116006)(52536014)(8936002)(66446008)(66946007)(64756008)(122000001)(33656002)(66556008)(66476007)(55016003)(478600001)(8676002)(38100700002);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?iso-8859-2?q?NslPHkleoRck7MEbIedaUQZ?= =?iso-8859-2?q?HMjNeMT+LE+Y2yeiJIz4toRdCS6O+usPegYo5ncwOPwQJHMdZcdV9XmueQpp?= =?iso-8859-2?q?VC7DkvUMOVlS8YGHuzGUUfMNwywCaFuAGd0Raq063a92/tymoiOSz4yzBry3?= =?iso-8859-2?q?waPGSikeEGyJHDSeWWVKw+cJzR3e3N/b2LWX2gb/QPAwOD9uDK7pBsnYZp20?= =?iso-8859-2?q?VBhV7Di322cGhpliuJ18dyqFIceN5KWpOMUnre/d+QoMbzb8PttTkZIep0Ax?= =?iso-8859-2?q?tq1iVzMOIEYJ9Y7XF6UZAb8HUwVPghWCCg0/HbGcLQI0T0YwFWD99VRRAlRL?= =?iso-8859-2?q?82pD1yeeCp12P4maYZ1hEoU6FlcDlnrn6CzkyUxWf9ztiUsmgM6QfUwqA5ZT?= =?iso-8859-2?q?ip0+xFbgUbn35t1Fgdm2papZhqX+Mcec3WnBzRT0Xen+BZ8QqMdmfrU0Gnm2?= =?iso-8859-2?q?Jsl9nChsT/PWKVCwfo2q3b6q7z2A5z2xg1CCEONrawRFoIjMa8rJO5CZ5rok?= =?iso-8859-2?q?NWPaWrXu6nD6OxUPTy18de5ubXxmBIxsw64fskEi3vzQcnLnwsBRYHWpwGDC?= =?iso-8859-2?q?g/l1m9Pc5YJD55f7gjgecK6RBiCVO+PF6JuxKtWpxzgVZv3B48WRYr6GrU1A?= =?iso-8859-2?q?4cyL2m498FqttT1jTHUQK1eVDj2nxVMVN7CnCKLzRx03ISci2OrAwyUgI5Lc?= =?iso-8859-2?q?xvN/jIPXagLwcCiS7+0t/ZvLbo8YrzhklRviQajvwhYVKY4Rc62Cw2Xukmm5?= =?iso-8859-2?q?d1a2B36PdOX37F8N8423U4JZizbJlejTlvcDDwvoq3YCQRpU02Gqk9ftxGTA?= =?iso-8859-2?q?0xTxKvv8/ayFHLzCMDYvV9h2Qqs5oH7kgsscEhBDf7FA9yc7G3KXXcgyP+io?= =?iso-8859-2?q?F7EF2ZBXajDhs/BThl7IfNqLxgZpqpIGuqAFKo6iWDTypLSS/GRP6Gnh9XlZ?= =?iso-8859-2?q?5vH/Tw4Oghv3glJSlct0TsQ0zTWZEe7+fMDj91N1ld75hSv2NdfFETNDlkMP?= =?iso-8859-2?q?qZbHQFAIR1ur9M33E1FqLsqEtfH7z+fXY2OSddOSIyBIVDruq78wfpgwFa8y?= =?iso-8859-2?q?NW4M3xbieloLo3v0tCn52nzExDhVIHj+I4eJfci9Y+VHu8wgEZrfWy+kNxKq?= =?iso-8859-2?q?TAAou9STsXWpXvjFbPZNumTYQld/x/f84Rfw10bx+XnTjbZLmKcSPJlxxNDU?= =?iso-8859-2?q?DG+wkZqFL7QJZKmMzXS+A/ce0r8U0TnpeqzuLmKV1zAj+c6cxGFiLMYxf0Cf?= =?iso-8859-2?q?72P3+pOOuDaiM/11ANtM+6XovUYOa9BoEg/2fhxhTufifnp9Gf7jvJd1puVN?= =?iso-8859-2?q?Zjwmhx9LJUeKKNpjNAvh8cG2xtBMbz/lB5zPAuRU47hxeKYlLTlFzclBQPMD?= =?iso-8859-2?q?gsYzqcptONtntwf+iY/hP5wQd1kK7zestVN49WI2OtvUNv2n7gn+TwMqZGZW?= =?iso-8859-2?q?oKToPw0l93jCof9kn/xDg3aBtZRd+rAHBBIkVQKqbSrCe8F0hQfVVAHQJjk5?= =?iso-8859-2?q?1c8KhMj0Qn3tusfLBlAUEmD6QFieyrenJFauO5uTbL/8HFqqxgJIIy/+/lN5?= =?iso-8859-2?q?zWA48DTp0A2XezIT4cHe1KuU43+7vmxNmMnDImn6F63RgrKBJVu4vq2o=3D?= MIME-Version: 1.0 X-OriginatorOrg: ziemas.net X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: BYAPR12MB3238.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 09855ae7-8ecf-40b5-c607-08dad81050da X-MS-Exchange-CrossTenant-originalarrivaltime: 07 Dec 2022 05:03:01.3781 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 25bf35ba-6df9-4cb3-af27-d7d470d29fed X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: FkTkNk0/OJRzoxPCmW1YQ3Ea6WRZlROjid+FShhhrDb51OjCL4tKZgm7IqoeFxfaBUEAsVImct5Cxf0i2Yuceg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN7PR12MB7108 Message-ID-Hash: JEVZ5PVIZ63ZC6IAGDZ2QCKWH7I2IS32 X-Message-ID-Hash: JEVZ5PVIZ63ZC6IAGDZ2QCKWH7I2IS32 X-MailFrom: zlaski@ziemas.net X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.7 Precedence: list List-Id: Discussion list for pacman development Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: X-Rspamd-Action: no action X-Rspamd-Server: mail.archlinux.org X-Rspamd-Queue-Id: 618A3177CE75 X-Spamd-Result: default: False [2.79 / 15.00]; DMARC_POLICY_QUARANTINE(1.50)[ziemas.net : SPF not aligned (relaxed),quarantine]; ARC_REJECT(1.00)[signature check failed: fail, {[1] = sig:microsoft.com:reject}]; R_DKIM_REJECT(1.00)[ziemas.net:s=selector1]; R_SPF_ALLOW(-0.20)[+ip4:95.217.236.249]; MAILLIST(-0.20)[mailman]; RCVD_IN_DNSWL_MED(-0.20)[95.217.236.249:from]; MIME_GOOD(-0.10)[text/plain]; HAS_LIST_UNSUB(-0.01)[]; TO_DN_EQ_ADDR_ALL(0.00)[]; FORGED_RECIPIENTS_MAILLIST(0.00)[]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:24940, ipnet:95.217.0.0/16, country:DE]; MIME_TRACE(0.00)[0:+]; NEURAL_HAM(-0.00)[-0.998]; RCVD_COUNT_FIVE(0.00)[5]; DKIM_TRACE(0.00)[ziemas.net:-]; FROM_HAS_DN(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[40.107.236.100:received]; PREVIOUSLY_DELIVERED(0.00)[pacman-dev@lists.archlinux.org]; FROM_NEQ_ENVFROM(0.00)[zlaski@ziemas.net,pacman-dev-bounces@lists.archlinux.org]; RCPT_COUNT_ONE(0.00)[1]; FORGED_SENDER_MAILLIST(0.00)[] This is pretty simple and hopefully self-explanatory, but please do ask questions if needed. Thanks, --Zem >From c4a5adf001d3124854572bab561fbe3a21a885d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ziemowit=20=C5=81=C4=85ski?= <15880281+zlaski@users.noreply.github.com> Date: Tue, 6 Dec 2022 19:53:57 -0800 Subject: [PATCH] Fix issues with libintl and libgpgme The `libintl` library was not getting pulled in if `ngettext()` was missing but option `i18n` was not specified. The accepted `libgpgme` version was too old, leading to a missing `GPGME_KEYLIST_MODE_LOCATE` macro. Signed-off-by: Ziemowit Łąski --- meson.build | 36 +++++++++++++++++++++--------------- 1 file changed, 21 insertions(+), 15 deletions(-) diff --git a/meson.build b/meson.build index c8ee42fd..a6c92276 100644 --- a/meson.build +++ b/meson.build @@ -77,16 +77,21 @@ conf.set_quoted('CACHEDIR', join_paths(LOCALSTATEDIR, 'cache/pacman/pkg/')) conf.set_quoted('HOOKDIR', join_paths(SYSCONFDIR, 'pacman.d/hooks/')) conf.set_quoted('ROOTDIR', ROOTDIR) -libintl = dependency('', required: false) -if get_option('i18n') - if not cc.has_function('ngettext') - libintl = cc.find_library('intl', required : false, static: get_option('buildstatic')) - if not libintl.found() - error('ngettext not found but NLS support requested') - endif - endif - conf.set('ENABLE_NLS', 1) +# i18n / ngettext +has_ngettext = cc.has_function('ngettext') +libintl = dependency('libintl', + required: false, + static: get_option('buildstatic')) +if not libintl.found() + libintl = cc.find_library('libintl', + required: false, + static: get_option('buildstatic')) +endif +conf.set('HAVE_LIBINTL', libintl.found()) +if not libintl.found() and (get_option('i18n') or not has_ngettext) + error('libintl not found even though ngettext() not found or NLS support requested') endif +conf.set('ENABLE_NLS', 1) # dependencies libarchive = dependency('libarchive', @@ -104,7 +109,7 @@ libcurl = dependency('libcurl', static : get_option('buildstatic')) conf.set('HAVE_LIBCURL', libcurl.found()) -needed_gpgme_version = '>=1.3.0' +needed_gpgme_version = '>=1.12.0' gpgme = dependency('gpgme', version : needed_gpgme_version, required : get_option('gpgme'), @@ -290,7 +295,7 @@ subdir('src/util') subdir('scripts') # Internationalization -if get_option('i18n') +if conf.get('HAVE_LIBINTL') i18n = import('i18n') subdir('lib/libalpm/po') subdir('src/pacman/po') @@ -350,7 +355,7 @@ pacman_bin = executable( pacman_sources, include_directories : includes, link_with : [libalpm, libcommon], - dependencies : [libarchive], + dependencies : [libarchive, libintl], install : true, ) @@ -359,7 +364,7 @@ executable( pacman_conf_sources, include_directories : includes, link_with : [libalpm, libcommon], - dependencies : [libarchive], + dependencies : [libarchive, libintl], install : true, ) @@ -368,7 +373,7 @@ executable( testpkg_sources, include_directories : includes, link_with : [libalpm], - dependencies : [libarchive], + dependencies : [libarchive, libintl], install : true, ) @@ -420,7 +425,7 @@ foreach path : [ join_paths(DATAROOTDIR, 'makepkg-template/'), join_paths(DATAROOTDIR, 'libalpm/hooks/'), ] - meson.add_install_script('sh', '-c', 'mkdir -p "$DESTDIR/@0@"'.format(path)) + meson.add_install_script('sh', '-c', 'mkdir -p "$DESTDIR@0@"'.format(path)) endforeach TEST_ENV = environment() @@ -464,6 +469,7 @@ message('\n '.join([ ' Build docs : @0@'.format(build_doc), ' debug build : @0@'.format(get_option('buildtype') == 'debug'), ' Use libcurl : @0@'.format(conf.get('HAVE_LIBCURL')), + ' Use libintl : @0@'.format(conf.get('HAVE_LIBINTL')), ' Use GPGME : @0@'.format(conf.get('HAVE_LIBGPGME')), ' Use OpenSSL : @0@'.format(conf.has('HAVE_LIBSSL') and conf.get('HAVE_LIBSSL') == 1),