From: Jean Pierre De Jesus DIAZ via Guix-patches via <guix-patches@gnu.org>
To: 56394@debbugs.gnu.org
Subject: [bug#56394] [PATCH] gnu: xl2tpd: Fix cross-compilation.
Date: Tue, 05 Jul 2022 09:30:47 +0000 [thread overview]
Message-ID: <QSO5GzC00biELncNpcasxQCTIiU63DcL1FtTQNo5_ON093VKJy849MUmwqUyxu5teS4s__GMGgQlIIq7L3PxXJffxeBNDpslPkg6yDtJQg4=@jeandudey.tech> (raw)
[-- Attachment #1: Type: text/plain, Size: 228 bytes --]
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
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0002-gnu-xl2tpd-Update-to-1.3.17.patch --]
[-- Type: text/x-patch; name=0002-gnu-xl2tpd-Update-to-1.3.17.patch, Size: 1407 bytes --]
From 511bb2155973e24767befe11ea9b9eb66641f075 Mon Sep 17 00:00:00 2001
Message-Id: <511bb2155973e24767befe11ea9b9eb66641f075.1657013271.git.me@jeandudey.tech>
In-Reply-To: <1baf2bb97ab79cd020718605131b0a087fa215b4.1657013271.git.me@jeandudey.tech>
References: <1baf2bb97ab79cd020718605131b0a087fa215b4.1657013271.git.me@jeandudey.tech>
From: Jean-Pierre De Jesus DIAZ <me@jeandudey.tech>
Date: Tue, 5 Jul 2022 11:27:01 +0200
Subject: [PATCH 2/2] gnu: xl2tpd: Update to 1.3.17.
* gnu/packages/vpn.scm (xl2tpd)[version]: Update to 1.3.17.
---
gnu/packages/vpn.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm
index d239288d10..e3b91549db 100644
--- a/gnu/packages/vpn.scm
+++ b/gnu/packages/vpn.scm
@@ -1163,7 +1163,7 @@ (define-public wireguard-tools
(define-public xl2tpd
(package
(name "xl2tpd")
- (version "1.3.16")
+ (version "1.3.17")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -1172,7 +1172,7 @@ (define-public xl2tpd
(file-name (git-file-name name version))
(sha256
(base32
- "0is5ccrvijz0pfm45pfrlbb9y8231yz3c4zqs8mkgakl9rxajy6l"))))
+ "06aiidwygywaa1jn8m2pw8l3vnsc2bjnacbjmlsdy1cqgr1f5cc9"))))
(build-system gnu-build-system)
(arguments
(list #:make-flags
--
2.36.1
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #3: 0001-gnu-xl2tpd-Fix-cross-compilation.patch --]
[-- Type: text/x-patch; name=0001-gnu-xl2tpd-Fix-cross-compilation.patch, Size: 2438 bytes --]
From 1baf2bb97ab79cd020718605131b0a087fa215b4 Mon Sep 17 00:00:00 2001
Message-Id: <1baf2bb97ab79cd020718605131b0a087fa215b4.1657012966.git.me@jeandudey.tech>
From: Jean-Pierre De Jesus DIAZ <me@jeandudey.tech>
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
next reply other threads:[~2022-07-05 9:32 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-05 9:30 Jean Pierre De Jesus DIAZ via Guix-patches via [this message]
2022-07-17 19:36 ` bug#56394: [PATCH] gnu: xl2tpd: Fix cross-compilation Ludovic Courtès
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='QSO5GzC00biELncNpcasxQCTIiU63DcL1FtTQNo5_ON093VKJy849MUmwqUyxu5teS4s__GMGgQlIIq7L3PxXJffxeBNDpslPkg6yDtJQg4=@jeandudey.tech' \
--to=guix-patches@gnu.org \
--cc=56394@debbugs.gnu.org \
--cc=me@jeandudey.tech \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.