GNU bug report logs - #57146
[PATCH] gnu: polkit: Fix cross-compiling

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 57146 in the body.
You can then email your comments to 57146 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Andrew Patterson <andrewpatt7 <at> gmail.com>
To: guix-patches <at> gnu.org
Cc: Andrew Patterson <andrewpatt7 <at> gmail.com>
Subject: [PATCH] gnu: polkit: Fix cross-compiling
Date: Thu, 11 Aug 2022 19:11:00 -0400

The polkit package used to refer to docbook-xsl via inputs rather native inputs,
which obviously doesn't work when cross-compiling.
---
 gnu/packages/polkit.scm | 165 ++++++++++++++++++++--------------------
 1 file changed, 83 insertions(+), 82 deletions(-)

diff --git a/gnu/packages/polkit.scm b/gnu/packages/polkit.scm
index a75608cd43..dd0cf42e5d 100644
--- a/gnu/packages/polkit.scm
+++ b/gnu/packages/polkit.scm
@@ -9,6 +9,7 @@
 ;;; Copyright © 2018 Ricardo Wurmus <rekado <at> elephly.net>
 ;;; Copyright © 2021 Morgan Smith <Morgan.J.Smith <at> outlook.com>
 ;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
+;;; Copyright © 2022 Andrew Patterson <andrewpatt7 <at> gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -27,6 +28,7 @@
 
 (define-module (gnu packages polkit)
   #:use-module ((guix licenses) #:select (lgpl2.0+))
+  #:use-module (guix gexp)
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix memoization)
@@ -55,92 +57,91 @@ (define-public polkit-mozjs
     (name "polkit")
     (version "0.120")
     (source (origin
-             (method url-fetch)
-             (uri (string-append
-                   "https://www.freedesktop.org/software/polkit/releases/"
-                   name "-" version ".tar.gz"))
-             (sha256
-              (base32
-               "00zfg9b9ivkcj2jcf5b92cpvvyljz8cmfwj86lkvy5rihnd5jypf"))
-             (patches (search-patches "polkit-configure-elogind.patch"
-                                      "polkit-CVE-2021-4034.patch"))
-             (modules '((guix build utils)))
-             (snippet
-              '(begin
-                 (use-modules (guix build utils))
-                 ;; Disable broken test.
-                 (substitute* "test/Makefile.in"
-                   (("SUBDIRS = mocklibc . polkit polkitbackend")
-                    "SUBDIRS = mocklibc . polkit"))
-                 ;; Disable a test that requires Python, D-Bus and a few
-                 ;; libraries and fails with "ERROR: timed out waiting for bus
-                 ;; process to terminate".
-                 (substitute* "test/polkitbackend/Makefile.am"
-                   (("TEST_PROGS \\+= polkitbackendjsauthoritytest-wrapper.py")
-                    ""))
-                 ;; Guix System's polkit
-                 ;; service stores actions under /etc/polkit-1/actions.
-                 (substitute* "src/polkitbackend/polkitbackendinteractiveauthority.c"
-                   (("PACKAGE_DATA_DIR \"/polkit-1/actions\"")
-                    "PACKAGE_SYSCONF_DIR \"/polkit-1/actions\""))
-                 ;; Set the setuid helper's real location.
-                 (substitute* "src/polkitagent/polkitagentsession.c"
-                   (("PACKAGE_PREFIX \"/lib/polkit-1/polkit-agent-helper-1\"")
-                    "\"/run/setuid-programs/polkit-agent-helper-1\""))))))
+              (method url-fetch)
+              (uri (string-append
+                    "https://www.freedesktop.org/software/polkit/releases/"
+                    name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "00zfg9b9ivkcj2jcf5b92cpvvyljz8cmfwj86lkvy5rihnd5jypf"))
+              (patches (search-patches "polkit-configure-elogind.patch"
+                                       "polkit-CVE-2021-4034.patch"))
+              (modules '((guix build utils)))
+              (snippet '(begin
+                          (use-modules (guix build utils))
+                          ;; Disable broken test.
+                          (substitute* "test/Makefile.in"
+                            (("SUBDIRS = mocklibc . polkit polkitbackend")
+                             "SUBDIRS = mocklibc . polkit"))
+                          ;; Disable a test that requires Python, D-Bus and a few
+                          ;; libraries and fails with "ERROR: timed out waiting for bus
+                          ;; process to terminate".
+                          (substitute* "test/polkitbackend/Makefile.am"
+                            (("TEST_PROGS \\+= polkitbackendjsauthoritytest-wrapper.py")
+                             ""))
+                          ;; Guix System's polkit
+                          ;; service stores actions under /etc/polkit-1/actions.
+                          (substitute* "src/polkitbackend/polkitbackendinteractiveauthority.c"
+                            (("PACKAGE_DATA_DIR \"/polkit-1/actions\"")
+                             "PACKAGE_SYSCONF_DIR \"/polkit-1/actions\""))
+                          ;; Set the setuid helper's real location.
+                          (substitute* "src/polkitagent/polkitagentsession.c"
+                            (("PACKAGE_PREFIX \"/lib/polkit-1/polkit-agent-helper-1\"")
+                             "\"/run/setuid-programs/polkit-agent-helper-1\""))))))
     (build-system gnu-build-system)
-    (inputs
-     (list expat linux-pam elogind mozjs nspr))
-    (propagated-inputs
-     (list glib)) ; required by polkit-gobject-1.pc
-    (native-inputs
-     (list pkg-config
-           `(,glib "bin")                         ;for glib-mkenums
-           intltool
-           gobject-introspection
-           libxslt                                ;for man page generation
-           docbook-xsl))                          ;for man page generation
+    (inputs (list expat linux-pam elogind mozjs nspr))
+    (propagated-inputs (list glib)) ;required by polkit-gobject-1.pc
+    (native-inputs (list pkg-config
+                         `(,glib "bin") ;for glib-mkenums
+                         intltool
+                         gobject-introspection
+                         libxslt ;for man page generation
+                         docbook-xsl)) ;for man page generation
     (arguments
-     `(#:configure-flags '("--sysconfdir=/etc"
-                           "--enable-man-pages"
-                           ;; Prevent ‘configure: error: cannot check for
-                           ;; file existence when cross compiling’.
-                           ,@(if (%current-target-system)
-                                 '("--with-os-type=unknown")
-                                 '()))
-       #:phases
-       (modify-phases %standard-phases
-         (add-after
-          'unpack 'fix-introspection-install-dir
-          (lambda* (#:key outputs #:allow-other-keys)
-            (let ((out (assoc-ref outputs "out")))
-              (substitute* (find-files "." "Makefile.in")
-                (("@INTROSPECTION_GIRDIR@")
-                 (string-append out "/share/gir-1.0/"))
-                (("@INTROSPECTION_TYPELIBDIR@")
-                 (string-append out "/lib/girepository-1.0/"))))))
-         (add-after 'unpack 'fix-manpage-generation
-           (lambda* (#:key inputs #:allow-other-keys)
-             (let ((xsldoc (string-append (assoc-ref inputs "docbook-xsl")
-                                          "/xml/xsl/docbook-xsl-"
-                                          ,(package-version docbook-xsl))))
-               (substitute* '("docs/man/Makefile.am" "docs/man/Makefile.in")
-                 (("http://docbook.sourceforge.net/release/xsl/current")
-                  xsldoc)))))
-         (replace
-          'install
-          (lambda* (#:key outputs (make-flags '()) #:allow-other-keys)
-            ;; Override sysconfdir during "make install", to avoid attempting
-            ;; to install in /etc, and to instead install the skeletons in the
-            ;; output directory.
-            (let ((out (assoc-ref outputs "out")))
-             (apply invoke "make" "install"
-                           (string-append "sysconfdir=" out "/etc")
-                           (string-append "polkit_actiondir="
-                                          out "/share/polkit-1/actions")
-                           make-flags)))))))
+     (list #:configure-flags `(list "--sysconfdir=/etc" "--enable-man-pages"
+                                    ;; Prevent ‘configure: error: cannot check for
+                                    ;; file existence when cross compiling’.
+                                    ,@(if (%current-target-system)
+                                          '("--with-os-type=unknown")
+                                          '()))
+           #:phases #~(modify-phases %standard-phases
+                        (add-after 'unpack 'fix-introspection-install-dir
+                          (lambda* (#:key outputs #:allow-other-keys)
+                            (let ((out (assoc-ref outputs "out")))
+                              (substitute* (find-files "." "Makefile.in")
+                                (("@INTROSPECTION_GIRDIR@")
+                                 (string-append out "/share/gir-1.0/"))
+                                (("@INTROSPECTION_TYPELIBDIR@")
+                                 (string-append out "/lib/girepository-1.0/"))))))
+                        (add-after 'unpack 'fix-manpage-generation
+                          (lambda* (#:key native-inputs #:allow-other-keys)
+                            (let ((xsldoc (string-append (assoc-ref
+                                                          native-inputs
+                                                          "docbook-xsl")
+                                           "/xml/xsl/docbook-xsl-"
+                                           #$(package-version docbook-xsl))))
+                              (substitute* '("docs/man/Makefile.am"
+                                             "docs/man/Makefile.in")
+                                (("http://docbook.sourceforge.net/release/xsl/current")
+                                 xsldoc)))))
+                        (replace 'install
+                          (lambda* (#:key outputs
+                                    (make-flags '()) #:allow-other-keys)
+                            ;; Override sysconfdir during "make install", to avoid attempting
+                            ;; to install in /etc, and to instead install the skeletons in the
+                            ;; output directory.
+                            (let ((out (assoc-ref outputs "out")))
+                              (apply invoke
+                                     "make"
+                                     "install"
+                                     (string-append "sysconfdir=" out "/etc")
+                                     (string-append "polkit_actiondir=" out
+                                                    "/share/polkit-1/actions")
+                                     make-flags)))))))
     (home-page "https://www.freedesktop.org/wiki/Software/polkit/")
     (synopsis "Authorization API for privilege management")
-    (description "Polkit is an application-level toolkit for defining and
+    (description
+     "Polkit is an application-level toolkit for defining and
 handling the policy that allows unprivileged processes to speak to
 privileged processes.  It is a framework for centralizing the decision
 making process with respect to granting access to privileged operations
-- 
2.37.1

Message #8 received at 57146 <at> debbugs.gnu.org (full text, mbox):

From: Mathieu Othacehe <othacehe <at> gnu.org>
To: Andrew Patterson <andrewpatt7 <at> gmail.com>
Cc: 57146 <at> debbugs.gnu.org
Subject: Re: bug#57146: [PATCH] gnu: polkit: Fix cross-compiling
Date: Fri, 12 Aug 2022 10:29:34 +0200

Hello Andrew,

> The polkit package used to refer to docbook-xsl via inputs rather native inputs,
> which obviously doesn't work when cross-compiling.

Thanks for working on that. It looks like this patch is breaking host
compilation:

--8<---------------cut here---------------start------------->8---
error: in phase 'fix-manpage-generation': uncaught exception:
wrong-type-arg "string-append" "Wrong type (expecting ~A): ~S" ("string" #f) (#f) 
phase `fix-manpage-generation' failed after 0.0 seconds
Backtrace:
           9 (primitive-load "/gnu/store/k2p4qxc23g871rm5q50bcx45f3m…")
In guix/build/gnu-build-system.scm:
    906:2  8 (gnu-build #:source _ #:outputs _ #:inputs _ #:phases . #)
--8<---------------cut here---------------end--------------->8---

Also you are doing a lot of things at the same time: fixing indentation,
introducing gexps, fixing cross-compilation. It would be great if you
could do that in separate patches to ease the review process.

Thanks,

Mathieu

Message #11 received at 57146 <at> debbugs.gnu.org (full text, mbox):

From: Jean Pierre De Jesus DIAZ <me <at> jeandudey.tech>
To: "57146 <at> debbugs.gnu.org" <57146 <at> debbugs.gnu.org>
Cc: Mathieu Othacehe <othacehe <at> gnu.org>,
 "andrewpatt7 <at> gmail.com" <andrewpatt7 <at> gmail.com>
Subject: [PATCH] gnu: polkit: Fix cross-compiling
Date: Fri, 12 Aug 2022 09:42:54 +0000

This issue is already solved:

https://issues.guix.gnu.org/56252

>Pushed to 'staging' in 7767d30f55, thanks!

Was fixed for both polkit-mozjs and polkit-duktape.

—
Jean-Pierre De Jesus DIAZ

Message #14 received at 57146 <at> debbugs.gnu.org (full text, mbox):

From: Jean Pierre De Jesus DIAZ <me <at> jeandudey.tech>
To: "57146 <at> debbugs.gnu.org" <57146 <at> debbugs.gnu.org>
Cc: Mathieu Othacehe <othacehe <at> gnu.org>,
 "andrewpatt7 <at> gmail.com" <andrewpatt7 <at> gmail.com>
Subject: Re: [PATCH] gnu: polkit: Fix cross-compiling
Date: Fri, 12 Aug 2022 09:57:04 +0000

However, the patch to introduce G-Expressions is welcome as I did
only fix the inputs/native-inputs usage.

>+                            (let ((out (assoc-ref outputs "out")))

Can be removed probably, and replace `out' here:

>+                                     (string-append "sysconfdir=" out "/etc")
>+                                     (string-append "polkit_actiondir=" out
>+                                                    "/share/polkit-1/actions")

By #$output. But, rethinking it again, I would investigate if this phase
can be removed and instead use `#:make-flags' if possible directly as
make-flags can be specified as a G-Expression.

>+                          (lambda* (#:key outputs #:allow-other-keys)
>+                            (let ((out (assoc-ref outputs "out")))
>+                              (substitute* (find-files "." "Makefile.in")
>+                                (("@INTROSPECTION_GIRDIR@")
>+                                 (string-append out "/share/gir-1.0/"))
>+                                (("@INTROSPECTION_TYPELIBDIR@")
>+                                 (string-append out "/lib/girepository-1.0/"))))))

Same here. And then:

>+                          (lambda* (#:key outputs #:allow-other-keys)

Is just then:

--8<---------------cut here---------------start------------->8---
(lambda _
  ...)
--8<---------------cut here---------------start------------->8---

>+     (list #:configure-flags `(list "--sysconfdir=/etc" "--enable-man-pages"
>+                                    ;; Prevent ‘configure: error: cannot check for
>+                                    ;; file existence when cross compiling’.
>+                                    ,@(if (%current-target-system)
>+                                          '("--with-os-type=unknown")
>+                                          '()))

G-Expressions can be used here too, e.g:

--8<---------------cut here---------------start------------->8---
(list #:configure-flags #~(list "--sysconfdir=/etc"
                                "--enable-man-pages"
                               ;; Prevent ‘configure: error: cannot check for
                               ;; file existence when cross compiling’.
                               #$@(if (%current-target-system)
                                     '("--with-os-type=unknown")
                                     '()))
--8<---------------cut here---------------start------------->8---

—
Jean-Pierre De Jesus DIAZ


------- Original Message -------
On Friday, August 12th, 2022 at 11:42 AM, Jean Pierre De Jesus DIAZ <me <at> jeandudey.tech> wrote:


> This issue is already solved:
> 
> https://issues.guix.gnu.org/56252
> 
> > Pushed to 'staging' in 7767d30f55, thanks!
> 
> 
> Was fixed for both polkit-mozjs and polkit-duktape.
> 
> —
> Jean-Pierre De Jesus DIAZ

Message #17 received at 57146 <at> debbugs.gnu.org (full text, mbox):

From: Andrew Patterson <andrewpatt7 <at> gmail.com>
To: Mathieu Othacehe <othacehe <at> gnu.org>
Cc: 57146 <at> debbugs.gnu.org
Subject: Re: bug#57146: [PATCH] gnu: polkit: Fix cross-compiling
Date: Fri, 12 Aug 2022 17:24:39 -0400

> Thanks for working on that. It looks like this patch is breaking 
> host
> compilation:
>
> error: in phase 'fix-manpage-generation': uncaught exception:
> wrong-type-arg "string-append" "Wrong type (expecting ~A): ~S" 
> ("string" #f) (#f) 
> phase `fix-manpage-generation' failed after 0.0 seconds
> Backtrace:
>            9 (primitive-load 
>            "/gnu/store/k2p4qxc23g871rm5q50bcx45f3m…")
> In guix/build/gnu-build-system.scm:
>     906:2  8 (gnu-build #:source _ #:outputs _ #:inputs _ 
>     #:phases . #)
Huh.  Looking at Jean Pierre's patch, apparently native-inputs 
only exists when cross-compiling, good to know.

> Also you are doing a lot of things at the same time: fixing 
> indentation,
> introducing gexps, fixing cross-compilation. It would be great 
> if you
> could do that in separate patches to ease the review process.
I'll make sure to keep that in mind in the future, sorry.

-- 
Andrew Patterson

Message #20 received at 57146 <at> debbugs.gnu.org (full text, mbox):

From: Andrew Patterson <andrewpatt7 <at> gmail.com>
To: Jean Pierre De Jesus DIAZ <me <at> jeandudey.tech>
Cc: Mathieu Othacehe <othacehe <at> gnu.org>,
 "57146 <at> debbugs.gnu.org" <57146 <at> debbugs.gnu.org>
Subject: Re: [PATCH] gnu: polkit: Fix cross-compiling
Date: Fri, 12 Aug 2022 17:27:58 -0400

Thanks for the suggestions!  I'll try and work on this some.

Should I continue sending patches in this thread, or start a new 
one?

-- 
Andrew Patterson

Message #23 received at 57146 <at> debbugs.gnu.org (full text, mbox):

From: Jean Pierre De Jesus DIAZ <me <at> jeandudey.tech>
To: andrewpatt7 <at> gmail.com
Cc: othacehe <at> gnu.org, 57146 <at> debbugs.gnu.org
Subject: Re: [PATCH] gnu: polkit: Fix cross-compiling
Date: Fri, 12 Aug 2022 22:48:48 +0000

[Message part 1 (text/plain, inline)]

On this same thread by replying to 57146 <at> debbugs.gnu.org
-------- Original Message --------
On Aug 12, 2022, 23:27, Andrew Patterson wrote:

> Thanks for the suggestions! I'll try and work on this some. Should I continue sending patches in this thread, or start a new one? -- Andrew Patterson

[Message part 2 (text/html, inline)]

Message #26 received at 57146 <at> debbugs.gnu.org (full text, mbox):

From: Jean Pierre De Jesus DIAZ <me <at> jeandudey.tech>
To: andrewpatt7 <at> gmail.com
Cc: othacehe <at> gnu.org, 57146 <at> debbugs.gnu.org
Subject: Re: [PATCH] gnu: polkit: Fix cross-compiling
Date: Sun, 14 Aug 2022 10:06:58 +0000

Don't know what happened that made my mail send an empty message :).

Yes you can send the updated patch to this same thread at:

57146 <at> debbugs.gnu.org

—
Jean-Pierre De Jesus DIAZ



------- Original Message -------
On Saturday, August 13th, 2022 at 12:48 AM, Jean Pierre De Jesus DIAZ <me <at> jeandudey.tech> wrote:


> On this same thread by replying to 57146 <at> debbugs.gnu.org
> -------- Original Message --------
> On Aug 12, 2022, 23:27, Andrew Patterson < andrewpatt7 <at> gmail.com> wrote:
> 
> > 
> > Thanks for the suggestions! I'll try and work on this some. Should I continue sending patches in this thread, or start a new one? -- Andrew Patterson

Message #29 received at 57146 <at> debbugs.gnu.org (full text, mbox):

From: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
To: Andrew Patterson <andrewpatt7 <at> gmail.com>
Cc: Jean Pierre De Jesus DIAZ <me <at> jeandudey.tech>,
 Mathieu Othacehe <othacehe <at> gnu.org>,
 "57146 <at> debbugs.gnu.org" <57146 <at> debbugs.gnu.org>
Subject: Re: bug#57146: [PATCH] gnu: polkit: Fix cross-compiling
Date: Tue, 03 Jan 2023 17:23:46 -0500

Hi Andrew,

Andrew Patterson <andrewpatt7 <at> gmail.com> writes:

> Thanks for the suggestions!  I'll try and work on this some.
>
> Should I continue sending patches in this thread, or start a new one?

Is there still something that needs fixing here, or can we close this?

-- 
Thanks,
Maxim

Message #34 received at 57146 <at> debbugs.gnu.org (full text, mbox):

From: Andrew Patterson <andrewpatt7 <at> gmail.com>
To: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
Cc: Jean Pierre De Jesus DIAZ <me <at> jeandudey.tech>,
 Mathieu Othacehe <othacehe <at> gnu.org>,
 "57146 <at> debbugs.gnu.org" <57146 <at> debbugs.gnu.org>
Subject: Re: bug#57146: [PATCH] gnu: polkit: Fix cross-compiling
Date: Tue, 03 Jan 2023 23:19:42 -0500

I haven't needed to cross-compile any guix images recently, but 
`guix build --target=aarch64-linux-gnu polkit-duktape` on an 
x86_64 machine just completed successfully, so I don't think 
there's any issue still here?

-- 
Andrew Patterson

Message #39 received at 57146-done <at> debbugs.gnu.org (full text, mbox):

From: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
To: Andrew Patterson <andrewpatt7 <at> gmail.com>
Cc: Jean Pierre De Jesus DIAZ <me <at> jeandudey.tech>,
 Mathieu Othacehe <othacehe <at> gnu.org>,
 "57146 <at> debbugs.gnu.org" <57146-done <at> debbugs.gnu.org>
Subject: Re: bug#57146: [PATCH] gnu: polkit: Fix cross-compiling
Date: Wed, 04 Jan 2023 00:16:15 -0500

Hi,

Andrew Patterson <andrewpatt7 <at> gmail.com> writes:

> I haven't needed to cross-compile any guix images recently, but `guix
> build --target=aarch64-linux-gnu polkit-duktape` on an x86_64 machine
> just completed successfully, so I don't think there's any issue still
> here?

Thanks for checking.  I'll close the issue.  It can be reopen if
somethig w.r.t. cross-compilation and polkit is amiss.

-- 
Thanks,
Maxim

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.