From patchwork Tue Feb 28 08:33:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Z572 <873216071@qq.com> X-Patchwork-Id: 47484 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id ABB5F16C32; Tue, 28 Feb 2023 08:35:56 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.5 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, FREEMAIL_FROM,FREEMAIL_REPLYTO_END_DIGIT,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 0A4F916BF5 for ; Tue, 28 Feb 2023 08:35:53 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pWvRy-0003hw-4T; Tue, 28 Feb 2023 03:35:06 -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 1pWvRx-0003go-0B for guix-patches@gnu.org; Tue, 28 Feb 2023 03:35:05 -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 1pWvRw-0007hM-Lx for guix-patches@gnu.org; Tue, 28 Feb 2023 03:35:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pWvRw-0005S8-Ff for guix-patches@gnu.org; Tue, 28 Feb 2023 03:35:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61865] [PATCH 7/8] gnu: libotf: fix cross-compile. Resent-From: Z572 <873216071@qq.com> Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 28 Feb 2023 08:35:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61865 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61865@debbugs.gnu.org Received: via spool by 61865-submit@debbugs.gnu.org id=B61865.167757324720824 (code B ref 61865); Tue, 28 Feb 2023 08:35:04 +0000 Received: (at 61865) by debbugs.gnu.org; 28 Feb 2023 08:34:07 +0000 Received: from localhost ([127.0.0.1]:49644 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pWvQz-0005Pg-Sa for submit@debbugs.gnu.org; Tue, 28 Feb 2023 03:34:07 -0500 Received: from out203-205-221-173.mail.qq.com ([203.205.221.173]:47785) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <873216071@qq.com>) id 1pWvQp-0005NM-C0 for 61865@debbugs.gnu.org; Tue, 28 Feb 2023 03:33:57 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qq.com; s=s201512; t=1677573228; bh=ZASri83+SmbP338lAMIBTBJ71PdFGKAXigHqUyezY/g=; h=From:To:Subject:Date:In-Reply-To:References; b=N0QXhNu1tXnWnDmb0jljElBLJ8oiGLDlbNpz8md/MIckDEsPMvwB5XW5fFIT0ru8a 6DedcL4eonw6a7kNcp+18lZAOFgflQpkkKHmv+GPJ4fyfcK6FDOlx4TKThQHuwlyno Uj9DrSuurANpCbMSDdKmha9CMe1ao+97WAgDXSLc= Received: from localhost.localdomain ([111.0.51.52]) by newxmesmtplogicsvrszb1-0.qq.com (NewEsmtp) with SMTP id 868856C0; Tue, 28 Feb 2023 16:33:40 +0800 X-QQ-mid: xmsmtpt1677573225twzlmuhu9 Message-ID: X-QQ-XMAILINFO: MIZfLI1VMPgss80tRtWZVyysVaXMDunZWnfW/GDo/I2QBm8bw5++lwSPeIeOrB sNbRH1RDJY2YaNKkCKrEhjzBHSRVqBTC+A0lct7zhEsvTVMeEn0ReXCBgyXwk6fvzI3R7Iuobwky Cn4Ewdxk1sp27LeRy4LnQhhlRsC1pSxUaSIJdMrpQzl+ZtdExG3XvSgvp8mGZD5cQ8V7mZntAs6n qCXCxR8vuZ7kler2HKAPq7vcvr+TRKrm20yyElC75Zj9dfasQjhsKojGbxAgjTdgwdbZ6+gBxg7U kq6cE9DtjuC42h012tfnjBMDh1VxWjrzQOBBUKdN/jnx0suAecBn183ouE15lN9PzcoRWD63JKxP Q72l75gOZE4aRrQaHoJy8jpwZBGUKd2V6bRi24SvZdu23XINRZZz0fy3fXqKyQPzlwBpNDthZsuS P47Eb1D2kMp6Phh9ifc/zYK9kZEKRMG7e7l956V1I22CytbOsktD09q1Th+Ipej5O/Fn0iNt8pYg akhTPvRK/vmW5e3wdwt7g/mJwSaLh17SgHlfJR0WurlIboqhNOsoRBSgaZN+qjr/IYhmnpiSB2Yx jF2L3KSczgtWq85HDaW2JclPyc7//YPYKVBQFzUCB2zbX5xnqakSr//5OwuMc+DFMT4hErkxFrWS VFsfV7bM0AsiQWSt1WzB4f2Qqclxr4+FQp54n383bB31ww2Nua9CY7jKkup4B7jw04u1RbwuI8kK S/DC656C2ehmu5ryHhc6cQLK56JTlp/GT3rMNoYx3qn7dn/tNfez5x/zMxCVoEx+0hWWqq1JU+CI souWbMYAOleJZK1ihMF7jEvTxfhR1K2Qlv97ed4J2EkoVptzHWm/g4dBhJr+a5rpiVkC3VqrcWI7 9L59BQPWy36Ore2LUN961JSJHYtGn8WFJYcAbR+ThiY55OTL47B1Yq2uiThh6fLGdCMBjZQm/uYz TgExI3kWyRCIkIBJ9lTBXBUsqqo/uZXko1cL2TvVo= Date: Tue, 28 Feb 2023 16:33:39 +0800 X-OQ-MSGID: <16e142c3f60c1ce5f6a0c47c5343f7592ffab058.1677572541.git.873216071@qq.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: References: MIME-Version: 1.0 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: Z572 <873216071@qq.com> X-ACL-Warn: , Z572 via Guix-patches X-Patchwork-Original-From: Z572 via Guix-patches via From: Z572 <873216071@qq.com> Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/fontutils.scm(libotf): fix cross-compile. [native-inputs]: add freetype, when cross-compile, add libtool, autoconf automake. [arguments]: when cross-compile, add phase to fix rpl_malloc undefined reference --- gnu/packages/fontutils.scm | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm index 72621cc006..d451f5e504 100644 --- a/gnu/packages/fontutils.scm +++ b/gnu/packages/fontutils.scm @@ -1392,7 +1392,22 @@ (define-public libotf (base32 "0sq6g3xaxw388akws6qrllp3kp2sxgk2dv4j79k6mm52rnihrnv8")))) (build-system gnu-build-system) (native-inputs - (list pkg-config)) + (append (if (%current-target-system) + (list libtool + autoconf automake) + '()) + (list pkg-config freetype))) + (arguments (if (%current-target-system) + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'fix-rpl_malloc + (lambda _ + (substitute* "configure.ac" + (("AC_FUNC_MALLOC") + "")) + (invoke "sh" "autogen.sh"))))) + '())) (propagated-inputs (list freetype)) (home-page "https://www.nongnu.org/m17n/")