unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: Jean Pierre De Jesus DIAZ via Guix-patches via <guix-patches@gnu.org>
To: 56395@debbugs.gnu.org
Subject: [bug#56395] [PATCH] gnu: connman: Fix cross-compilation.
Date: Tue, 05 Jul 2022 10:36:00 +0000	[thread overview]
Message-ID: <5PTK0kbX-JObHWk1_PyvOAtIn_H7zccFlfGaO-dQ23oVbmMPMf89bX6C932pku_WpOzE_wMWtaDYBULY7eVb5XsfJHvxUlIb9U9mo2UpFVo=@jeandudey.tech> (raw)

[-- Attachment #1: Type: text/plain, Size: 82 bytes --]

Fixes cross-compilation for `connman' package.

—
Jean-Pierre De Jesus DIAZ

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-connman-Fix-cross-compilation.patch --]
[-- Type: text/x-patch; name=0001-gnu-connman-Fix-cross-compilation.patch, Size: 3072 bytes --]

From 5e0e95de9d71082f3681c1038278980aa68e6e42 Mon Sep 17 00:00:00 2001
Message-Id: <5e0e95de9d71082f3681c1038278980aa68e6e42.1657017290.git.me@jeandudey.tech>
From: Jean-Pierre De Jesus DIAZ <me@jeandudey.tech>
Date: Tue, 5 Jul 2022 12:33:16 +0200
Subject: [PATCH] gnu: connman: Fix cross-compilation.

* gnu/packages/connman.scm (connman): Fix cross-compilation.
  [arguments]: Use G-Expressions. Set path to binaries at
  `#:configure-flags'.
---
 gnu/packages/connman.scm | 38 +++++++++++++++++++++++++-------------
 1 file changed, 25 insertions(+), 13 deletions(-)

diff --git a/gnu/packages/connman.scm b/gnu/packages/connman.scm
index 6221b56d77..71dff3588f 100644
--- a/gnu/packages/connman.scm
+++ b/gnu/packages/connman.scm
@@ -24,6 +24,7 @@ (define-module (gnu packages connman)
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix build-system gnu)
+  #:use-module (guix gexp)
   #:use-module (guix licenses)
   #:use-module (guix utils)
   #:use-module (gnu packages)
@@ -55,19 +56,30 @@ (define-public connman
          (base32 "12g5ilcnymx6i45z3359yds3cgd2dfqjyncfm92hqlymzps41yvr"))))
     (build-system gnu-build-system)
     (arguments
-     `(#:configure-flags
-       (list "--enable-nmcompat"
-             "--enable-polkit" ; Polkit doesn't need to be present at build time.
-             "--enable-iwd"
-             "--enable-openconnect"
-             "--enable-openvpn"
-             "--enable-vpnc"
-             "--enable-l2tp"
-             "--localstatedir=/var"
-             (string-append
-              "--with-dbusconfdir=" (assoc-ref %outputs "out") "/etc")
-             (string-append
-              "--with-dbusdatadir=" (assoc-ref %outputs "out") "/share"))))
+     (list #:configure-flags
+           #~(list "--enable-nmcompat"
+                   ;; PolKit doesn't need to be present at build time.
+                   "--enable-polkit"
+                   "--enable-iwd"
+                   "--enable-l2tp"
+                   "--enable-openconnect"
+                   "--enable-openvpn"
+                   "--enable-vpnc"
+                   "--localstatedir=/var"
+                   (string-append "--with-l2tp="
+                                  #$(this-package-input "xl2tpd")
+                                  "/sbin/xl2tpd")
+                   (string-append "--with-openconnect="
+                                  #$(this-package-input "openconnect")
+                                  "/sbin/openconnect")
+                   (string-append "--with-openvpn="
+                                  #$(this-package-input "openvpn")
+                                  "/sbin/openvpn")
+                   (string-append "--with-vpnc="
+                                  #$(this-package-input "vpnc")
+                                  "/sbin/vpnc")
+                   (string-append "--with-dbusconfdir=" #$output "/etc")
+                   (string-append "--with-dbusdatadir=" #$output "/share"))))
     (native-inputs
      (list pkg-config
            python-wrapper))
-- 
2.36.1


             reply	other threads:[~2022-07-05 10:37 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-07-05 10:36 Jean Pierre De Jesus DIAZ via Guix-patches via [this message]
2022-07-05 10:40 ` [bug#56395] (No Subject) Jean Pierre De Jesus DIAZ via Guix-patches via
2022-07-06  9:45 ` bug#56395: [PATCH] gnu: connman: Fix cross-compilation Efraim Flashner

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

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to='5PTK0kbX-JObHWk1_PyvOAtIn_H7zccFlfGaO-dQ23oVbmMPMf89bX6C932pku_WpOzE_wMWtaDYBULY7eVb5XsfJHvxUlIb9U9mo2UpFVo=@jeandudey.tech' \
    --to=guix-patches@gnu.org \
    --cc=56395@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 public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).