From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.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 wOCdObeBfGTJCwAASxT56A (envelope-from ) for ; Sun, 04 Jun 2023 14:21:12 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id qbE4ObeBfGSgXQEAauVa8A (envelope-from ) for ; Sun, 04 Jun 2023 14:21:11 +0200 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 18E8F19700 for ; Sun, 4 Jun 2023 14:21:11 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q5mjJ-0001x2-5a; Sun, 04 Jun 2023 08:21:06 -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 1q5mjH-0001vu-Gv for guix-patches@gnu.org; Sun, 04 Jun 2023 08:21: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 1q5mjH-0006rt-7I for guix-patches@gnu.org; Sun, 04 Jun 2023 08:21:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1q5mjH-0007gm-1v for guix-patches@gnu.org; Sun, 04 Jun 2023 08:21:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#61865] [PATCH 7/8] gnu: libotf: fix cross-compile. Resent-From: Efraim Flashner Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 04 Jun 2023 12:21:03 +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: Z572 <873216071@qq.com> Cc: 61865@debbugs.gnu.org Received: via spool by 61865-submit@debbugs.gnu.org id=B61865.168588121629435 (code B ref 61865); Sun, 04 Jun 2023 12:21:03 +0000 Received: (at 61865) by debbugs.gnu.org; 4 Jun 2023 12:20:16 +0000 Received: from localhost ([127.0.0.1]:45235 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q5miU-0007ef-EA for submit@debbugs.gnu.org; Sun, 04 Jun 2023 08:20:16 -0400 Received: from mail-ed1-f49.google.com ([209.85.208.49]:47213) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q5miQ-0007eD-EK for 61865@debbugs.gnu.org; Sun, 04 Jun 2023 08:20:12 -0400 Received: by mail-ed1-f49.google.com with SMTP id 4fb4d7f45d1cf-51496f57e59so5112826a12.2 for <61865@debbugs.gnu.org>; Sun, 04 Jun 2023 05:20:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1685881205; x=1688473205; h=in-reply-to:content-disposition:mime-version:references :mail-followup-to:message-id:subject:cc:to:from:date:sender:from:to :cc:subject:date:message-id:reply-to; bh=4LZvqDAUIGH5qUhP7Ha07fZ2zirNze0dBB5b2mG5QFA=; b=TqlozXNOKP8IEIbj9CwcB07u0ZKg0owH5tfFinu7ysHPbGBk4WSCYtCG+glUOFGmMT +W8cPqxyLn7BYn7x9iNwL+LDO0f/dHjAQU2fcRd8/91wylQWv0Qh/ilns5KCsfL7H5fA LYDg84Om/fJivRZM8LIeoLLIy5h2ClCGmZinbwGLO92J9l9NQiHDyUb7pZSofNrR37J9 QfOdA4MweFeBjdLCwXXtkKEj7pI6yGupkqSUyzGHFR7ZC5l2ZbzlTTrfgm00PRRIwuiq KuWKdD6PzQk3koLl1pykX+NcHv8WqfjdRg+GDWMiRf0rFi7+LBbzqcIqtCSZRtgbEODH tLBg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685881205; x=1688473205; h=in-reply-to:content-disposition:mime-version:references :mail-followup-to:message-id:subject:cc:to:from:date:sender :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=4LZvqDAUIGH5qUhP7Ha07fZ2zirNze0dBB5b2mG5QFA=; b=LfL1WyZXOTDDIW3EjjIpkppK4adOI+EcCDsbpWDrWtAIQHnagTs0+DpVI1L6RR+DgP 1F6+xkLCOyIgZ4SXtAC8es9e/0dn3CDLZDboi116WlkP7vgpYil15P8nWWuRG6TA8khD GFlk4WV2fj7yHriauxtMEwT2sscBKrCqgi64DfDUZKGX3xOmf0K6sR1n8O/L7AWWapul rHqkfQiH5OAr7uggWTkERp2IH5uAaR+a7Ovcil93MRpcwVxB/jnraRIjODobj7PpTVq5 otrOHtTcAJOjgFnb51otFabkWU5Yi9mPkwrDr3NsuHrQ8ugshIZ5fDgklwUWZtSdZhkM oq3Q== X-Gm-Message-State: AC+VfDzxVYtZIGRDExRNyL4TrwWO6De4ARYLOTl+hOY5YsOaPJlY6roA bRmLkSKHZtABOtLYSdc1E4k= X-Google-Smtp-Source: ACHHUZ41+1QMIGnu6vN6AYuwfiJEoeXkQFX+dnd0+yrvXIUuDJxaf9E88T9agX8R10jgXQBxHWZv5A== X-Received: by 2002:a05:6402:184d:b0:510:d0bc:e130 with SMTP id v13-20020a056402184d00b00510d0bce130mr5159304edy.33.1685881204447; Sun, 04 Jun 2023 05:20:04 -0700 (PDT) Received: from localhost ([2a02:ed3:913:500:b62e:99ff:fef0:7bc0]) by smtp.gmail.com with ESMTPSA id m18-20020aa7d352000000b00511aea132b9sm2745877edr.3.2023.06.04.05.20.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 04 Jun 2023 05:20:04 -0700 (PDT) Date: Sun, 4 Jun 2023 15:19:59 +0300 From: Efraim Flashner Message-ID: Mail-Followup-To: Efraim Flashner , Z572 <873216071@qq.com>, 61865@debbugs.gnu.org References: MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="Jsi3bvkcNsOToxsG" Content-Disposition: inline In-Reply-To: X-PGP-Key-ID: 0x41AAE7DCCA3D8351 X-PGP-Key: https://flashner.co.il/~efraim/efraim_flashner.asc X-PGP-Fingerprint: A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 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=1685881271; a=rsa-sha256; cv=none; b=o+HukfTSq2HXRQD0nGlCTww/xNNI8aAK0z7fOe5QL5mQUeHise1RBi9SeEBYdhIxy0o5bh +QrqzjTKHmUxdraHZFdGSGt2Rx+FWM5/FUYQgedRgJo5Lndj/XDA74Hrb8WFl+XbphNGjs ebniR8YJzgorGeetxJRdYo7+Cd2esZw99hHJG+WXIt6rFTftpxc04/6znUfJ/sEvy+gPsD MbgWmQQh01rgSyWW+39wpnWcu8UNtJwnOhT33YowwUKTB0IWBXwO+53KrTzkiKbkOFYn8A ehg56CdP0rIsZUBqCYcDVgO5DMaGCaLNUs4A65pvXWl6Eans3UBCwmmeChQLcw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20221208 header.b=TqlozXNO; dmarc=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=1685881271; 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=4LZvqDAUIGH5qUhP7Ha07fZ2zirNze0dBB5b2mG5QFA=; b=O4L2yc7fp6MianYsw9/fZNOODsLEVhPBvtXRGrzKXwLnaYA4FzjD4D1EJIjQUj4yIzGtL8 mP4DaBJRdLURKvrE1phDfUtgKWDtJp60qlQwq1sMlqnZhouH78AVt3LuWy02FMfQ5wJGk1 crNp63ol/5Fsq70USmpWZ92PRVPiHdypxT4wQcR4Gz82SSr7jrc8C40lOK8C1RGh9qLdkj RGpGDpvx/IT6twVtousq2OFZd3TI5auN8Wnoo4fTCAbGjdzYoNXAyUseMYVI9u+k/zz2g6 mHzsenaEVpiJzdwKmNkEQQTtAAgRWF++S27n4p10NPA4ffXhMqH7DEXjXSzFww== Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20221208 header.b=TqlozXNO; dmarc=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: scn0.migadu.com X-Migadu-Spam-Score: -3.38 X-Spam-Score: -3.38 X-Migadu-Queue-Id: 18E8F19700 X-TUID: 5BmJthOyW8Aw --Jsi3bvkcNsOToxsG Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable This one I didn't apply. I don't believe adding freetype as a native-input is correct but I could see adding it as an input. In the end libotf links to freetype, and we don't want it to link to the one in native-inputs. I don't think the phase is the correct way to do this. I didn't see any error related to it when I was building it before applying the patch, and I made it pretty far after overriding the location of freetype-config. On Tue, Feb 28, 2023 at 04:33:39PM +0800, Z572 via Guix-patches via wrote: > * 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 re= ference > --- > gnu/packages/fontutils.scm | 17 ++++++++++++++++- > 1 file changed, 16 insertions(+), 1 deletion(-) >=20 > 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 "0sq6g3xaxw388akws6qrllp3kp2sxgk2dv4j79k6mm52rnih= rnv8")))) > (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/") > --=20 > 2.39.1 >=20 >=20 >=20 >=20 --=20 Efraim Flashner =D7=A8=D7=A0=D7=A9=D7=9C=D7=A4 = =D7=9D=D7=99=D7=A8=D7=A4=D7=90 GPG key =3D A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 Confidentiality cannot be guaranteed on emails sent or received unencrypted --Jsi3bvkcNsOToxsG Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEoov0DD5VE3JmLRT3Qarn3Mo9g1EFAmR8gW8ACgkQQarn3Mo9 g1H0pQ//aIcDPNn7ETK8LQHu2/LboJOSAJbdoPYMW9WrYusIc4NRzKzseniSPezu vHhI4H4Cglmm7T7JH2rMtfCNeXHlr2Cpe2oZ2XzGQX851OwFdM5ZWbJKBQskztfV Xj87o03mtrifiWSqJ41gesI9gDG98+5tWCjW8NOeXBRPaWt1FPUYQsDMHoQ7f2Am No969qhohMz4+5mcBbJEOjWkOkBhjLYH+mFDboiN5xKjOhYczvZGPMiCSjty3go0 B7MJRVw0OnrGfhxFbKXHj0rM28cbGR072fttNJbW2ZIZkELTrvrc/ffzKPgYrpdd kZIGj2lS+ganzH1QNp1uwx+/pjdo+mmJGGRO+TSIQ4wUm/+b8PnOl/BeslQ5OT9P 1o7aNSGV4jJBL7gMCQ7987bd5aFz3kbkdn6zjyk+aH7XNb/mZjpyD0hryqOUxzlr uY6jPB6gppCjj3hsmSIgeOItD6HB7akfNlefBX6k+uOL21YFF/WFT47crpOT//GI CvvtHjD/YPacDs7xnt9zq0LH3SoEmqIR4/p/P/ofDNA7yZaEjswJjLYQ8Zlr/mA5 J+MSoBERx55r1t/Rp4v0vSQUeYmieeUYj6Z8UorkaWz9LEbGhnqayGega44aE77r uLLPGc+wrP5HY80MC7FXTfC0W6CN7r0AimMnERdElNGRpPEgrO4= =JCkm -----END PGP SIGNATURE----- --Jsi3bvkcNsOToxsG--