From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id IN9UKU+UuWKoLQEAbAwnHQ (envelope-from ) for ; Mon, 27 Jun 2022 13:28:15 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id 6HFLKE+UuWKzJQEAG6o9tA (envelope-from ) for ; Mon, 27 Jun 2022 13:28:15 +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 38CDB43FFD for ; Mon, 27 Jun 2022 13:28:15 +0200 (CEST) Received: from localhost ([::1]:56804 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o5muc-0008II-5A for larch@yhetil.org; Mon, 27 Jun 2022 07:28:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56720) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o5muQ-0008IA-9n for guix-patches@gnu.org; Mon, 27 Jun 2022 07:28:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:56145) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1o5muQ-00012T-1a for guix-patches@gnu.org; Mon, 27 Jun 2022 07:28:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1o5muP-0007eV-UC for guix-patches@gnu.org; Mon, 27 Jun 2022 07:28:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#56253] [PATCH]: gnu: vpnc: Fix cross-compilation. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 27 Jun 2022 11:28:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 56253 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Jean Pierre De Jesus DIAZ , 56253@debbugs.gnu.org Received: via spool by 56253-submit@debbugs.gnu.org id=B56253.165632925629357 (code B ref 56253); Mon, 27 Jun 2022 11:28:01 +0000 Received: (at 56253) by debbugs.gnu.org; 27 Jun 2022 11:27:36 +0000 Received: from localhost ([127.0.0.1]:50042 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o5mtz-0007dO-MU for submit@debbugs.gnu.org; Mon, 27 Jun 2022 07:27:36 -0400 Received: from michel.telenet-ops.be ([195.130.137.88]:51248) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o5mtx-0007dB-Jf for 56253@debbugs.gnu.org; Mon, 27 Jun 2022 07:27:34 -0400 Received: from ptr-bvsjgyhxw7psv60dyze.18120a2.ip6.access.telenet.be ([IPv6:2a02:1811:8c09:9d00:3c5f:2eff:feb0:ba5a]) by michel.telenet-ops.be with bizsmtp id oBTX2700N4UW6Th06BTYiA; Mon, 27 Jun 2022 13:27:32 +0200 Message-ID: From: Maxime Devos Date: Mon, 27 Jun 2022 13:27:27 +0200 In-Reply-To: References: Content-Type: multipart/signed; micalg="pgp-sha512"; protocol="application/pgp-signature"; boundary="=-MasGdbmzVf1A/4qwUPM1" User-Agent: Evolution 3.38.3-1 MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r22; t=1656329252; bh=UGDJMBG/qwbsdql5RFJBcXmaDkN5Qbjy6/kblEC3T/k=; h=Subject:From:To:Date:In-Reply-To:References; b=oIN+FAtzicTZaPY2Bdx9JGEY/7ngwqlp0Su4zkE4OsrbZgXmjrlMk1UogaptfpCej 7x9douTc+/A1xkAwlAm63QYAeV4MU4rIu1SfNs3jBmTf+cwBdf0IJQW29jjM2Cmvye u8B3BvTomv3qD7wXP4ZToiYOoUOR3BAR++056psxOSQcKMAeM5ROdjhXqpWpgUOC40 KdTY1IFciyy1UjkAAKZFM08+0OsdpEJtBlfncAeFbgT89fJ8YqbbSm0r+kIU/2E/gx tF7EZ0Cp2V4UchDZ94ns/c/uer5zcXJT3eSuqLAn66rKjlqFuI/Z7MMEyP5vAfDQXb k9JgWQJPoVuxw== 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" X-Migadu-Flow: FLOW_IN X-Migadu-To: larch@yhetil.org X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1656329295; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to: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=UGDJMBG/qwbsdql5RFJBcXmaDkN5Qbjy6/kblEC3T/k=; b=eh5BLxAGPtFqaXlPojEqHhZfxy3MPBpZAUAfxLZXtJqEjorB95ANi/hgHTsmVjdwy4UFQ4 2NuqTqZRaUcC8j8vYIIFDT/pI+CJSXquKGYQjbVMmjpgP6K1FAECplRzEfICNc82TkJ4BL QA8TQPyAugKx/WZcEs/y+etc52B9FYekXutJ03dqCEUD2+WJ9cZ3Ok7V1pu4UQ3JUGPTq4 a0jlgCMVx/3aTMuvpFSXfGRlfBMkuWzD2Xzq7T8bNaqi/x7AMoS4wj/3NbiXLxb9xRlS2R gaxbuUwOXZ3G+Mo685gItgAaOoJlRrDJ0CorMMLvpSf8zjaioCBxkcFXK5Egqw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1656329295; a=rsa-sha256; cv=none; b=LfIY0oOEruONs+qcDiTZjV8W1qW0QFPXHHE4LOvbeCLJ9xN5YLyWtHpXhqA7TV3k3JL2eW WxomdbhJ76Dt5KUPSvr1vXsZjKct+HHBN+CP3cY8vd1lNRdtF7E8mlxTRr4yToQna12SOq XzDhxbP7QvfvJReWK6zqFUs7tDajQXskDQfWNiN5OkC5wAQYlNHvwSXvsu8fPD56L+9Jdp QpPj8Gd8NoiDhxboBwV4dLwZ1rsimiUjPqKcT5lmydHPl1YYl5PQQs3lMNTxF337HKTOd8 tqC8ijZG4h+6jd90uPBUcmFtax41RYESY17NqelV8ukjh+GF43YcjlPomEBI5A== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r22 header.b=oIN+FAtz; dmarc=fail reason="SPF not aligned (relaxed)" header.from=telenet.be (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-Spam-Score: 3.15 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r22 header.b=oIN+FAtz; dmarc=fail reason="SPF not aligned (relaxed)" header.from=telenet.be (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-Queue-Id: 38CDB43FFD X-Spam-Score: 3.15 X-Migadu-Scanner: scn0.migadu.com X-TUID: g3tailPLhDWe --=-MasGdbmzVf1A/4qwUPM1 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Jean Pierre De Jesus DIAZ via Guix-patches via schreef op ma 27-06-2022 om 10:52 [+0000]: > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0 (replace 'build > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0 (lambda* (#:key inputs make-flags parallel-build? > target > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0 #:allow-other-keys) > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 ;; When cross-compiling, the bash scri= pt > 'libgcrypt-config' > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 ;; must be accessible during the confi= gure phase. > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (when target > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (setenv "PATH" > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0 (string-append > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (dirname > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (search-input-file inputs > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0 "bin/libgcrypt- > config")) It would be simpler to replace 'libgcrypt-config --libs' by 'pkg-config --libs' (with a substitute*, post-unpack) and likewise for 'libgcrypt-config --libs', to avoid executing a script compiled for another architecture locally (it works because of a preceding $(shell ..., though doesn't seem great to me). (Additionally, maybe upstream would be interested in pkg-config which mostly just works when cross-compiling, in constrast to ...-config scripts?) > + #~(let ((out (assoc-ref %outputs "out"))) If you're using G-exps, you might as well replace (assoc-ref %outputs "out") by #$output. Also, there's no configure phase, it has been removed. >+ ;; manpage. This step is not necessary when the target= is >+ ;; the host. >+ (when target >+ (apply invoke "make" "vpnc.8" "CC=3Dgcc" >+ (if parallel-build? >+ (list "-j" (number->string (parallel-job-c= ount))) >+ '())) >+ (install-file "vpnc.8" >+ (string-append (assoc-ref outputs "out= ") >+ "/share/man/man8")) >+ (invoke "make" "clean")))) You can simplify this by adding vpnc itself to the native-inputs (condition= al on %current-target-system to avoid a cycle) and when cross-compiling, copy = the man page from the native input to vpnc.8 (pre-build, instead of replacing b= uild, then you don't needd to fiddle with parallelism flags or the install phase)= . >+ ;; Remove installation of COPYING as 'install- license-files >+ ;; phase does it with a proper version number. >+ (substitute* "Makefile" >+ (("install -m644 COPYING.*") ""))))))) Independent change, so for a separate commit. Also, I don't think it's worth it to remove the double installation -- we would be deviating from upstream and at most some KB would be saved but we have automated depulication. Or maybe it's nice for consistency, dunno. >+ (license (list license:gpl2+ >+ ;; dh.c >+ ;; dh.h >+ ;; math_group.c >+ ;; math_group.h >+ license:bsd-2)) Again independent change -- I don't think it was necessary to mention the file names (but I don't think they have to be removed either). More precise license information looks nice. Greetings, Maxime. --=-MasGdbmzVf1A/4qwUPM1 Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- iI0EABYKADUWIQTB8z7iDFKP233XAR9J4+4iGRcl7gUCYrmUHxccbWF4aW1lZGV2 b3NAdGVsZW5ldC5iZQAKCRBJ4+4iGRcl7pZnAQD2W4SlMUm3Iwi8elCBxCpA2OHj +fZ2uwRWHpfPCrykowEAs2NcSBjerhkOdcL31Qk/ePh83HlM8ctqBNWC/3vSswU= =pAPA -----END PGP SIGNATURE----- --=-MasGdbmzVf1A/4qwUPM1--