From patchwork Tue Jul 5 09:30:47 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: 40517 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 118AF27BBEA; Tue, 5 Jul 2022 10:32:28 +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 7C43F27BBE9 for ; Tue, 5 Jul 2022 10:32:27 +0100 (BST) Received: from localhost ([::1]:50494 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o8euw-0002TQ-M3 for patchwork@mira.cbaines.net; Tue, 05 Jul 2022 05:32:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52262) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o8euY-0002SD-V0 for guix-patches@gnu.org; Tue, 05 Jul 2022 05:32:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:55441) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1o8euY-0004ij-LN for guix-patches@gnu.org; Tue, 05 Jul 2022 05:32:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1o8euY-0006tg-JB for guix-patches@gnu.org; Tue, 05 Jul 2022 05:32:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#56394] [PATCH] gnu: xl2tpd: Fix cross-compilation. Resent-From: Jean Pierre De Jesus DIAZ Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 05 Jul 2022 09:32:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 56394 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 56394@debbugs.gnu.org X-Debbugs-Original-To: "guix-patches@gnu.org" Received: via spool by submit@debbugs.gnu.org id=B.165701348726463 (code B ref -1); Tue, 05 Jul 2022 09:32:02 +0000 Received: (at submit) by debbugs.gnu.org; 5 Jul 2022 09:31:27 +0000 Received: from localhost ([127.0.0.1]:49338 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o8eto-0006sb-6I for submit@debbugs.gnu.org; Tue, 05 Jul 2022 05:31:26 -0400 Received: from lists.gnu.org ([209.51.188.17]:48110) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o8etj-0006sO-LU for submit@debbugs.gnu.org; Tue, 05 Jul 2022 05:31:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52104) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o8etj-0002Jb-Fu for guix-patches@gnu.org; Tue, 05 Jul 2022 05:31:11 -0400 Received: from mail-4018.proton.ch ([185.70.40.18]:28013) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o8etf-0004an-4f for guix-patches@gnu.org; Tue, 05 Jul 2022 05:31:10 -0400 Date: Tue, 05 Jul 2022 09:30:47 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jeandudey.tech; s=protonmail3; t=1657013454; x=1657272654; bh=Ue0ONJPbfehRa3qqlUvvyXYW1sL8Cf0E0BJrqsRQOhc=; h=Date:To:From:Reply-To:Subject:Message-ID:Feedback-ID:From:To:Cc: Date:Subject:Reply-To:Feedback-ID:Message-ID; b=kUXV722etd/14sN5udTvINZ9ADXcHnEtbhElx0UQH/qvhMK1sPD/TFfmRplZwuskV h2ZltoYUug8mPUHepqb/msElahU3HvAclm90uh0jJr/7Iz0lpF7WA3o7zaPKs13FnB +fJFUAhs5vMIzgAs9bqKtmcRwwaYfHgbXyTBDCTv+Zy6Xf8y6h94VLs87d9lo0tYq+ msMLmyOqTdlxLKJ7EcqVlJK9r5CQUEr9llzE0AmtPl6yJNfEjCwrUkCjnnXbl577+i 2j5TGf3HkOWlObdKb4GM8UrLEuiooKlOb9pbfxdmue9/YGOTcwUaYVkgM40XrEJBc2 K6B3hrcVVpLbQ== Message-ID: Feedback-ID: 20187791:user:proton MIME-Version: 1.0 Received-SPF: pass client-ip=185.70.40.18; envelope-from=me@jeandudey.tech; helo=mail-4018.proton.ch X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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: , 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 Fixes cross-compilation and also updates (optionally) the version of xl2tpd to 1.3.17, the changes between versions is minimal: https://github.com/xelerance/xl2tpd/compare/v1.3.16..v1.3.17 — Jean-Pierre De Jesus DIAZ From 1baf2bb97ab79cd020718605131b0a087fa215b4 Mon Sep 17 00:00:00 2001 Message-Id: <1baf2bb97ab79cd020718605131b0a087fa215b4.1657012966.git.me@jeandudey.tech> From: Jean-Pierre De Jesus DIAZ Date: Tue, 5 Jul 2022 11:21:07 +0200 Subject: [PATCH] gnu: xl2tpd: Fix cross-compilation. * gnu/packages/vpn.scm (xl2tpd): Fix cross-compilation. [arguments]: Use G-Expressions and use `cc-for-target'. --- gnu/packages/vpn.scm | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm index 23141e56a3..d239288d10 100644 --- a/gnu/packages/vpn.scm +++ b/gnu/packages/vpn.scm @@ -1175,19 +1175,21 @@ (define-public xl2tpd "0is5ccrvijz0pfm45pfrlbb9y8231yz3c4zqs8mkgakl9rxajy6l")))) (build-system gnu-build-system) (arguments - `(#:make-flags (list (string-append "PREFIX=" %output) - "CC=gcc") - #:phases (modify-phases %standard-phases - (delete 'configure) ;no configure script - (add-before 'build 'setup-environment - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "l2tp.h" - (("/usr/sbin/pppd") - (search-input-file inputs "/sbin/pppd"))) - (setenv "KERNELSRC" - (assoc-ref inputs "kernel-headers")) - #t))) - #:tests? #f)) ; no tests provided + (list #:make-flags + #~(list (string-append "PREFIX=" #$output) + (string-append "CC=" #$(cc-for-target))) + #:phases + #~(modify-phases %standard-phases + (delete 'configure) ;; No configure script. + (add-before 'build 'setup-environment + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "l2tp.h" + (("/usr/sbin/pppd") + (search-input-file inputs "/sbin/pppd"))) + (setenv "KERNELSRC" + (assoc-ref inputs "kernel-headers")) + #t))) + #:tests? #f)) ;; No tests provided. (inputs (list libpcap ppp)) (home-page "https://www.xelerance.com/software/xl2tpd/") (synopsis "Layer 2 Tunnelling Protocol Daemon (RFC 2661)") -- 2.36.1