From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id GCfcKjTLGWT3dwAASxT56A (envelope-from ) for ; Tue, 21 Mar 2023 16:20:20 +0100 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id mO/FKjTLGWRFFgAA9RJhRA (envelope-from ) for ; Tue, 21 Mar 2023 16:20:20 +0100 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 1238F2D21A for ; Tue, 21 Mar 2023 16:20:20 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pedmO-00089o-9x; Tue, 21 Mar 2023 11:20:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pedmM-000893-Mz for guix-patches@gnu.org; Tue, 21 Mar 2023 11:20:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pedmM-0008Dt-D2 for guix-patches@gnu.org; Tue, 21 Mar 2023 11:20:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pedmM-0000le-8q for guix-patches@gnu.org; Tue, 21 Mar 2023 11:20:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#60430] [PATCH] gnu: icu4c: Update packaging style. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 21 Mar 2023 15:20:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60430 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Nicolas Graves Cc: 60430@debbugs.gnu.org, GNU Debbugs Received: via spool by 60430-submit@debbugs.gnu.org id=B60430.16794119922929 (code B ref 60430); Tue, 21 Mar 2023 15:20:02 +0000 Received: (at 60430) by debbugs.gnu.org; 21 Mar 2023 15:19:52 +0000 Received: from localhost ([127.0.0.1]:60235 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pedmB-0000l6-Q2 for submit@debbugs.gnu.org; Tue, 21 Mar 2023 11:19:52 -0400 Received: from mail-qt1-f179.google.com ([209.85.160.179]:36403) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pedm9-0000kn-Ai; Tue, 21 Mar 2023 11:19:49 -0400 Received: by mail-qt1-f179.google.com with SMTP id hf2so14091181qtb.3; Tue, 21 Mar 2023 08:19:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1679411983; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=IekRyNqwlDCUFbVg4Tacs1CaKQge9qJWHGAgNOpIrYc=; b=IWSS4v0u4+60MxbSIaR42KvohqPJvqvmPpyvn2lcEW0Ft5JkwveWdOOQbN1d+wQVpq xrqBa7Ddluav9l9qEZ+cqDdr1kvVliZ6WJFd8Rn7m9KKgNW9f44ODRB2b6elTVmTDMqR VfuISEIYHT9L0OvS4KicLgAW9/OiknmZuOCPpARSTwZcKITjImRz5x8LLxe5tLwjAGs7 oulZidKkJYS/w6W7QNfKhQW2tbnkOPqxHEoQeV6Jcq7HsEld4H5XH4WTv21qSDmpTWEj jtyqVHcHrzJJeM5kM49Abue3FpGoQhxQkukkjN8R6z71JJ1Q482tOn9+AlEUD3W+8Ogn RSyw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679411983; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=IekRyNqwlDCUFbVg4Tacs1CaKQge9qJWHGAgNOpIrYc=; b=gecak14SJh5TVRsOd/fLcbdqzivly4yhIzJYjP2JurEK6tee+fU+0wXFXzo/vjgSBK UiA6yJBlOmWP4RFp75Y4GP6MSdGovxa0u5sy7Xkv1aCBKLErKB7YbJZksTB6BaIPqrRk MuxHoxYhTpwoxLSou1uXvVefdPtA4dr21bEt5g6bzQHOiKMdnrFIf+YUN/TPUXj15NSW 32O/wxX6IZryRkZq4BjSc8m6+Yq+O6xNfKZhI+WWH2agCWLhg7Q1KmsmeMRXESA75VhB LNxbIamksUOkf2HKS0gVT7WTgQHQwU/9k4+1VMlvBcv/c61r9VlK+pggB4qsnGPJYRCt dZJQ== X-Gm-Message-State: AO0yUKW4uo/hRqCqpjwWkSqEnjQDuW69NAq+8vy8VxP0/IgNaNjApMYt Cmf9I4KYzhYJ9RVK2kmS/AzMpVt19UwWMw== X-Google-Smtp-Source: AK7set+opxSPuvBlgmTsYYPESTCbjZp4gjNRkr3mAneUJnw1NGhASXTLzd2a4bkLEo1pUMUY/DMvBQ== X-Received: by 2002:a05:622a:452:b0:3e3:8727:174f with SMTP id o18-20020a05622a045200b003e38727174fmr250424qtx.41.1679411983341; Tue, 21 Mar 2023 08:19:43 -0700 (PDT) Received: from hurd ([2607:fad8:4:3::1004]) by smtp.gmail.com with ESMTPSA id d18-20020ac86692000000b003e386bb1566sm548590qtp.31.2023.03.21.08.19.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Mar 2023 08:19:43 -0700 (PDT) From: Maxim Cournoyer References: <20221230160900.28075-1-ngraves@ngraves.fr> Date: Tue, 21 Mar 2023 11:19:41 -0400 In-Reply-To: <20221230160900.28075-1-ngraves@ngraves.fr> (Nicolas Graves's message of "Fri, 30 Dec 2022 17:09:00 +0100") Message-ID: <87jzzap1wy.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN ARC-Seal: i=1; s=key1; d=yhetil.org; t=1679412020; a=rsa-sha256; cv=none; b=cIMVrcdkESCu/bqqn7A5z1mmeu9jADmQDPmBHUNxryGeUuaMmbIGRvDco7h27Sj9d2hHb8 bRAJtBTQPx6XNhRcIxQs61S/223F/eQy/y0b/kE8vd/zg1/JSHPHreQp/FFINg6BJ19GMk WwEkJYh07zaQo6eqqcBGyBQhx+5H1PxtgfDOZG/LuQTdvsu4Jk/8WRyAxrsQ+9Aqm005in l41M40uq4t0o9dqQ9ENSjbdKZIqcjIPjjWnSDjwE4/SPjeFIRGCHKvy2wW2nuE8wazgUIs GnqthW1m9a4Hm458vnjxMn++4d1JWrtIBhrP4BxCx5jOf0nuAssMN+Ao9P8Leg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=IWSS4v0u; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1679412020; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:resent-cc:resent-from:resent-sender: resent-message-id:in-reply-to:in-reply-to:references:references: list-id:list-help:list-unsubscribe:list-subscribe:list-post: dkim-signature; bh=IekRyNqwlDCUFbVg4Tacs1CaKQge9qJWHGAgNOpIrYc=; b=nZtK/7j1/iyIQhedkR2e9s65942y8M+of/2dPlad2OteP4oBnv0Uyp9j6WyWVjW+Z6r2NC R9KGGobiFTWEBhtTLT7EXh31FsXuyQiv4kh0CvvQ+cGs7plQw0lel3R2TOpxRJp+awvWxd 9xwQ0dYDxh7D2t/84y7ZeNhNtQOERFar71n2TAZODzEBxLKBM1ahjy4rGkga4n9OWFXc7h Raf0NAP5R1oQueIN0MYS95RPA8M8koyzha88v6iIkn4x5cN9/+nCO3fC6cGYPFmuJSo400 cBPbtErhs4wvcSHpUa48X9K+ytFgPF+s7JjtXRS5LBQH5xA4/zz4IbwSJUOcxw== X-Migadu-Spam-Score: 5.75 X-Spam-Score: 5.75 X-Migadu-Queue-Id: 1238F2D21A Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=IWSS4v0u; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Scanner: scn1.migadu.com X-TUID: jk3GjZ/Idj4p retitle 60430 [PATCH core-updates] gnu: icu4c: Update packaging style. quit Hello! Nicolas Graves writes: > * gnu/packages/icu4c.scm (icu4c): Update packaging style. > --- > gnu/packages/icu4c.scm | 66 ++++++++++++++++++++---------------------- > 1 file changed, 32 insertions(+), 34 deletions(-) > > diff --git a/gnu/packages/icu4c.scm b/gnu/packages/icu4c.scm > index 1e4f66d956..1338c8f525 100644 > --- a/gnu/packages/icu4c.scm > +++ b/gnu/packages/icu4c.scm > @@ -63,41 +63,39 @@ (define-public icu4c > (inputs > (list perl)) > (arguments > - `(#:configure-flags > - (list > + (list > + #:configure-flags > + `(list > "--enable-rpath" > - ,@(if (%current-target-system) > - '((string-append "--with-cross-build=" > - (assoc-ref %build-inputs "icu4c-build-root"))) > - '())) > - #:phases > - (modify-phases %standard-phases > - (add-after 'unpack 'chdir-to-source > - (lambda _ (chdir "source") #t)) > - (add-after 'chdir-to-source 'update-LDFLAGS > - (lambda _ > - ;; Do not create a "data-only" libicudata.so because it causes > - ;; problems on some architectures (notably armhf and MIPS). > - (substitute* "config/mh-linux" > - (("LDFLAGSICUDT=-nodefaultlibs -nostdlib") > - "LDFLAGSICUDT=")) > - #t)) > - ,@(if (target-riscv64?) > - `((add-after 'unpack 'disable-failing-test > - ;; It is unknown why this test is failing. > - (lambda _ > - (substitute* "source/test/intltest/numbertest_api.cpp" > - (("(TESTCASE_AUTO\\(unitUsage\\));" all) > - (string-append "//" all)))))) > - '()) > - (add-after 'install 'avoid-coreutils-reference > - ;; Don't keep a reference to the build tools. > - (lambda* (#:key outputs #:allow-other-keys) > - (let ((out (assoc-ref outputs "out"))) > - (substitute* (find-files (string-append out "/lib/icu") > - "\\.inc$") > - (("INSTALL_CMD=.*/bin/install") "INSTALL_CMD=install")) > - #t)))))) > + ,@(if (%current-target-system) > + '((string-append "--with-cross-build=" > + (assoc-ref %build-inputs "icu4c-build-root"))) > + '())) > + #:phases > + #~(modify-phases %standard-phases > + (add-after 'unpack 'chdir-to-source > + (lambda _ (chdir "source"))) > + (add-after 'chdir-to-source 'update-LDFLAGS > + (lambda _ > + ;; Do not create a "data-only" libicudata.so because it causes > + ;; problems on some architectures (notably armhf and MIPS). > + (substitute* "config/mh-linux" > + (("LDFLAGSICUDT=-nodefaultlibs -nostdlib") > + "LDFLAGSICUDT=")))) > + #$@(if (target-riscv64?) > + `((add-after 'unpack 'disable-failing-test > + ;; It is unknown why this test is failing. > + (lambda _ > + (substitute* "source/test/intltest/numbertest_api.cpp" > + (("(TESTCASE_AUTO\\(unitUsage\\));" all) > + (string-append "//" all)))))) > + '()) > + (add-after 'install 'avoid-coreutils-reference > + ;; Don't keep a reference to the build tools. > + (lambda _ > + (substitute* (find-files (string-append #$output "/lib/icu") > + "\\.inc$") > + (("INSTALL_CMD=.*/bin/install") "INSTALL_CMD=install"))))))) > (synopsis "International Components for Unicode") > (description > "ICU is a set of C/C++ and Java libraries providing Unicode and This looks good, but it's a core-updates change: guix refresh -l icu4c@69 says 12433 packages would be rebuilt. Also, you should update all the variants which inherits this one to also use gexp expressions, as it may cause problems otherwise. I'm adding 'core-updates' to the title to avoid merge mistakes. Thanks for working on it! -- Maxim