From patchwork Wed Jun 22 18:40:36 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jean Pierre De Jesus DIAZ X-Patchwork-Id: 40254 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 D61DF27BBEA; Wed, 22 Jun 2022 20:25:38 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable 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 5EEB027BBE9 for ; Wed, 22 Jun 2022 20:25:38 +0100 (BST) Received: from localhost ([::1]:53886 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o45yr-0008Iq-Hk for patchwork@mira.cbaines.net; Wed, 22 Jun 2022 15:25:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56958) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o45Ig-0003Jp-FB for guix-patches@gnu.org; Wed, 22 Jun 2022 14:42:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:42681) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1o45Ig-0002rp-6v for guix-patches@gnu.org; Wed, 22 Jun 2022 14:42:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1o45Ig-0007Gt-5F for guix-patches@gnu.org; Wed, 22 Jun 2022 14:42:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#56151] [PATCH]: gnu: ppp: Fix cross-compilation Resent-From: Jean Pierre De Jesus DIAZ Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 22 Jun 2022 18:42:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 56151 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 56151@debbugs.gnu.org X-Debbugs-Original-To: "guix-patches@gnu.org" Received: via spool by submit@debbugs.gnu.org id=B.165592327727890 (code B ref -1); Wed, 22 Jun 2022 18:42:01 +0000 Received: (at submit) by debbugs.gnu.org; 22 Jun 2022 18:41:17 +0000 Received: from localhost ([127.0.0.1]:36578 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o45Hx-0007Fl-6h for submit@debbugs.gnu.org; Wed, 22 Jun 2022 14:41:17 -0400 Received: from lists.gnu.org ([209.51.188.17]:34664) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o45Hr-0007FY-OY for submit@debbugs.gnu.org; Wed, 22 Jun 2022 14:41:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56842) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o45Hr-0001Uq-Gj for guix-patches@gnu.org; Wed, 22 Jun 2022 14:41:11 -0400 Received: from mail-4317.proton.ch ([185.70.43.17]:17118) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o45Hj-0002mV-FB for guix-patches@gnu.org; Wed, 22 Jun 2022 14:41:11 -0400 Date: Wed, 22 Jun 2022 18:40:36 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jeandudey.tech; s=protonmail3; t=1655923245; x=1656182445; bh=mzcUXjxXoYXJ6fnU1NUXDp961VoHs6e9P0omunT/jyQ=; h=Date:To:From:Reply-To:Subject:Message-ID:Feedback-ID:From:To:Cc: Date:Subject:Reply-To:Feedback-ID:Message-ID; b=CXOCNEp96XR9nmfZeAS+18anHV7jaDVD4taIYpDoje6tNvK+mvE82a9uDpoiV/Jjr fktoGWkkcSfSefWs0YoVyKNxKl6jACCKXaOVST6dKmFg32c+gfbk03pixkNsixfBUO SOi+LXdAnoIAAtxcFS0H/dILdYEsydvqEnBldfUUDOGH9Xm8mOHJFkRdE3MkVMaA+z YtKbOF5yy9dmNNs42BaHILZ7uAJCH89IsCxL8nBo42B3rErgaJSGeYpJRj4ZMkNob5 Pfmiuq6WZObqjMSW+dimMdnwK0ppFdl7i8R6llpiiSk9ILo3tZW/ns3LBpwji7q7dg PZRV6xm1cvF/g== Message-ID: Feedback-ID: 20187791:user:proton MIME-Version: 1.0 Received-SPF: pass client-ip=185.70.43.17; envelope-from=me@jeandudey.tech; helo=mail-4317.proton.ch X-Spam_score_int: -16 X-Spam_score: -1.7 X-Spam_bar: - X-Spam_report: (-1.7 / 5.0 requ) BAYES_00=-1.9, DKIM_INVALID=0.1, DKIM_SIGNED=0.1, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" Reply-to: Jean Pierre De Jesus DIAZ X-ACL-Warn: , Jean Pierre De Jesus DIAZ via Guix-patches X-Patchwork-Original-From: Jean Pierre De Jesus DIAZ via Guix-patches via From: Jean Pierre De Jesus DIAZ X-getmail-retrieved-from-mailbox: Patches Building `ppp` right now fails when cross-compiling for other systems. Discovered it while generating an installation image for RockPro64 on a `x86-64-linux-gnu` system. guix build ppp --keep-failed \ --target=aarch64-linux-gnu This patch removes an outdated substitution, and modifies the existing ones to match what the source code expects. From 99ed433400d7d33b4b9811ac22fdfb4b637492fd Mon Sep 17 00:00:00 2001 Message-Id: <99ed433400d7d33b4b9811ac22fdfb4b637492fd.1655922891.git.me@jeandudey.tech> From: Jean-Pierre De Jesus DIAZ Date: Wed, 22 Jun 2022 20:29:05 +0200 Subject: [PATCH] gnu: ppp: Fix cross-compilation. * gnu/packages/samba.scm (ppp)[arguments]: Use G-Expressions. Remove unused substitution. Fix OpenSSL and libpcap include paths. --- gnu/packages/samba.scm | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/gnu/packages/samba.scm b/gnu/packages/samba.scm index b775ad905c..208dca94ca 100644 --- a/gnu/packages/samba.scm +++ b/gnu/packages/samba.scm @@ -10,6 +10,7 @@ ;;; Copyright © 2019 Rutger Helling ;;; Copyright © 2020 Pierre Langlois ;;; Copyright © 2020, 2022 Maxim Cournoyer +;;; Copyright © 2022 Jean-Pierre De Jesus DIAZ ;;; ;;; This file is part of GNU Guix. ;;; @@ -469,23 +470,22 @@ (define-public ppp "1bhhksdclsnkw54a517ndrw55q5zljjbh9pcqz1z4a2z2flxpsgk")))) (build-system gnu-build-system) (arguments - '(#:tests? #f ; no check target - #:make-flags '("CC=gcc") - #:phases - (modify-phases %standard-phases - (add-before 'configure 'patch-Makefile - (lambda* (#:key inputs #:allow-other-keys) - (let ((libc (assoc-ref inputs "libc")) - (openssl (assoc-ref inputs "openssl")) - (libpcap (assoc-ref inputs "libpcap"))) - (substitute* "pppd/Makefile.linux" - (("/usr/include/crypt\\.h") - (string-append libc "/include/crypt.h")) - (("/usr/include/openssl") - (string-append openssl "/include/openssl")) - (("/usr/include/pcap-bpf.h") - (string-append libpcap "/include/pcap-bpf.h"))) - #t)))))) + (list #:tests? #f ;; No "check" target + #:make-flags #~(list (string-append "CC=" #$(cc-for-target))) + #:phases + #~(modify-phases %standard-phases + (add-before 'configure 'patch-Makefile + (lambda* (#:key inputs #:allow-other-keys) + (let ((openssl (assoc-ref inputs "openssl")) + (libpcap (assoc-ref inputs "libpcap"))) + (substitute* "pppd/Makefile.linux" + (("/usr/include/openssl") + (string-append openssl "/include")) + (("-DPPP_FILTER") + (string-append "-DPPP_FILTER -I" libpcap "/include"))) + (substitute* "pppd/pppcrypt.h" + (("des\\.h") "openssl/des.h"))) + #t))))) (inputs (list libpcap (@ (gnu packages tls) openssl))) -- 2.36.1