From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id YNlRLnkNr2PEeQAAbAwnHQ (envelope-from ) for ; Fri, 30 Dec 2022 17:10:33 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id 8KNcLXkNr2MkAwEAG6o9tA (envelope-from ) for ; Fri, 30 Dec 2022 17:10:33 +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 4FC6E39262 for ; Fri, 30 Dec 2022 17:10:33 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pBHxT-0002hl-JW; Fri, 30 Dec 2022 11:10:11 -0500 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 1pBHxP-0002fr-Ts for guix-patches@gnu.org; Fri, 30 Dec 2022 11:10:07 -0500 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 1pBHxJ-0007YZ-Vr for guix-patches@gnu.org; Fri, 30 Dec 2022 11:10:07 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pBHxJ-0000lo-R0 for guix-patches@gnu.org; Fri, 30 Dec 2022 11:10:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60430] [PATCH] gnu: icu4c: Update packaging style. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 30 Dec 2022 16:10:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 60430 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 60430@debbugs.gnu.org Cc: ngraves@ngraves.fr X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16724165732913 (code B ref -1); Fri, 30 Dec 2022 16:10:01 +0000 Received: (at submit) by debbugs.gnu.org; 30 Dec 2022 16:09:33 +0000 Received: from localhost ([127.0.0.1]:35984 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pBHwn-0000ks-GE for submit@debbugs.gnu.org; Fri, 30 Dec 2022 11:09:32 -0500 Received: from lists.gnu.org ([209.51.188.17]:34322) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pBHwl-0000kj-Cc for submit@debbugs.gnu.org; Fri, 30 Dec 2022 11:09:27 -0500 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 1pBHwl-0002UO-3Y for guix-patches@gnu.org; Fri, 30 Dec 2022 11:09:27 -0500 Received: from 8.mo550.mail-out.ovh.net ([178.33.110.239]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pBHwi-0007Sj-Qw for guix-patches@gnu.org; Fri, 30 Dec 2022 11:09:26 -0500 Received: from director10.ghost.mail-out.ovh.net (unknown [10.109.146.19]) by mo550.mail-out.ovh.net (Postfix) with ESMTP id 250AC238D2 for ; Fri, 30 Dec 2022 16:09:10 +0000 (UTC) Received: from ghost-submission-747dc469fd-pvbcd (unknown [10.110.208.248]) by director10.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 4E6E81FEAD; Fri, 30 Dec 2022 16:09:09 +0000 (UTC) Received: from ngraves.fr ([37.59.142.102]) by ghost-submission-747dc469fd-pvbcd with ESMTPSA id 8Kg7FCUNr2N7JwEAUY42lw (envelope-from ); Fri, 30 Dec 2022 16:09:09 +0000 X-OVh-ClientIp: 80.215.85.90 Date: Fri, 30 Dec 2022 17:09:00 +0100 Message-Id: <20221230160900.28075-1-ngraves@ngraves.fr> X-Mailer: git-send-email 2.38.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Ovh-Tracer-Id: 947444775557849826 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvhedrieeigdekgecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgggfestdekredtredttdenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpeekffegteffgfffjeegjedvfffgtddvueeutefgfeeuvdejgedvgeejjeevueeuveenucfkphepuddvjedrtddrtddruddpfeejrdehledrudegvddruddtvdenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqpdhnsggprhgtphhtthhopedupdhrtghpthhtohepghhuihigqdhprghttghhvghssehgnhhurdhorhhgpdfovfetjfhoshhtpehmohehhedtpdhmohguvgepshhmthhpohhuth Received-SPF: pass client-ip=178.33.110.239; envelope-from=ngraves@ngraves.fr; helo=8.mo550.mail-out.ovh.net X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: , Reply-to: Nicolas Graves X-ACL-Warn: , Nicolas Graves via Guix-patches From: Nicolas Graves via Guix-patches via 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-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1672416633; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=LdVE3iJ0IXdIKUftYhNu+9nEUI13hp8KeJ0Jgr/BCNs=; b=aLKs685AMRaoCxo71HlgUl8Arg+2uqOrGZph5tjAkmf7tCRZ0N5AKX38lgJ/NjBfUJrZsB /fYVQz38O5KtkFPz/Gmkt/miYsPQArnHebG2Vw6UuZmMyMhiHKfz4r47gBd7lKmMeHONV4 /AMnrloz9XAjdbmRqNsqM8/6UUpNyTrsAYc2Us+xcK6f9LaizAwGKCE17cdoQ6NHxq5VLu Nmlb6gDs5U7TPd1FPTVkwoxaiFhCvOYzLR7+0CXzawJHib0ZVZ1tU0wlQh74yZg93yEcaE lNzuj+16iltH5FoxiceToHh9qSBP5FI8akdIKJfjX35roUpFg1zXeVQMTaqP2w== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=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"; dmarc=pass (policy=none) header.from=gnu.org ARC-Seal: i=1; s=key1; d=yhetil.org; t=1672416633; a=rsa-sha256; cv=none; b=NZOL2seQ2WfYFVYLmkNmhAroXPoYEpQ5LeUkob22wOM0g/8/8MlbQAmnUSkW5y+gADkvAI XS7vGboeD0jTSf4fjE3K+nQ3Fn6GB4DXxrfJ/KotRTm6SGf+/tDh2spena6/BWNyMd0KTo zHa1vrD+B4x41tXaiF9RPtasbr+lWjeAdhrCZZ94e78mCjUR9WYW5lAKKeS7zk9XwP/ELY 4H2NrEuOPnkXmkM5j6m16Ba445cTnHSMdeqVksd59dmTe5qRWvEApo0JVUDCbQRYpxI2EK koPIxWEs8yrCu6j3nG0552adiSfSqvwhdZE2PucJS4IXBWqaY+Bb4+bvPI53iA== X-Spam-Score: -1.73 X-Migadu-Queue-Id: 4FC6E39262 Authentication-Results: aspmx1.migadu.com; dkim=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"; dmarc=pass (policy=none) header.from=gnu.org X-Migadu-Scanner: scn1.migadu.com X-Migadu-Spam-Score: -1.73 X-TUID: pDgWfyo3NDn4 * 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 -- 2.38.1