[PATCH 0/1] Build polkit on core-updates

[PATCH 0/1] Build polkit on core-updates

[Leo Famulari]

lkit couldn't find mozjs and wouldn't build on core-updates. Maybe due
to the addition of mozjs-24, which I believe happened after the last
release.

I specified the dependency on mozjs-17. It seems that polkit does not
support mozjs-24:
http://lists.freedesktop.org/archives/polkit-devel/2015-July/000432.html

I also cribbed the configure-flags from mozjs-17's ".pc" file. I don't
know why pkg-config didn't work.

It's weird that all the paths in mozjs are like this:
mozjs-..pc
libmozjs-..so
js-.

Feel free to push

Leo Famulari (1):
  gnu: polkit: Fix detection of mozjs-17.

 gnu/packages/polkit.scm | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

-- 
2.7.0.rc3

[PATCH 1/1] gnu: polkit: Fix detection of mozjs-17.

[Leo Famulari]

* gnu/packages/polkit.scm (polkit)[arguments]: Add LIBJS_LIBS and
LIBJS_CFLAGS for mozjs-17.
---
 gnu/packages/polkit.scm | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/polkit.scm b/gnu/packages/polkit.scm
index 4cafb45..3a119c2 100644
--- a/gnu/packages/polkit.scm
+++ b/gnu/packages/polkit.scm
@@ -80,7 +80,7 @@
      `(("expat" ,expat)
        ("linux-pam" ,linux-pam)
        ("elogind" ,elogind)
-       ("mozjs" ,mozjs)
+       ("mozjs-17" ,mozjs)
        ("nspr" ,nspr)))
     (propagated-inputs
      `(("glib" ,glib))) ; required by polkit-gobject-1.pc
@@ -90,8 +90,16 @@
        ("intltool" ,intltool)
        ("gobject-introspection" ,gobject-introspection)))
     (arguments
-     `(#:configure-flags '("--sysconfdir=/etc"
-                           "--enable-man-pages")
+     `(#:configure-flags
+       (let ((libjs (assoc-ref %build-inputs "mozjs-17")))
+         (list
+           "--sysconfdir=/etc"
+           "--enable-man-pages"
+           ;; FIXME: Make this use pkg-config
+           (string-append "LIBJS_CFLAGS="
+                          "-include " libjs "/include/js-./js/RequiredDefines.h"
+                          " -I" libjs "/include/js-.")
+           (string-append "LIBJS_LIBS=-L" libjs "/lib -lmozjs-.")))
        #:phases
        (modify-phases %standard-phases
          (add-after
-- 
2.7.0.rc3

Re: [PATCH 1/1] gnu: polkit: Fix detection of mozjs-17.

[宋文武]

Leo Famulari <leo@famulari.name> writes:

> * gnu/packages/polkit.scm (polkit)[arguments]: Add LIBJS_LIBS and
> LIBJS_CFLAGS for mozjs-17.
> ---
>  gnu/packages/polkit.scm | 14 +++++++++++---
>  1 file changed, 11 insertions(+), 3 deletions(-)
>
> diff --git a/gnu/packages/polkit.scm b/gnu/packages/polkit.scm
> index 4cafb45..3a119c2 100644
> --- a/gnu/packages/polkit.scm
> +++ b/gnu/packages/polkit.scm
> @@ -80,7 +80,7 @@
>       `(("expat" ,expat)
>         ("linux-pam" ,linux-pam)
>         ("elogind" ,elogind)
> -       ("mozjs" ,mozjs)
> +       ("mozjs-17" ,mozjs)
>         ("nspr" ,nspr)))
>      (propagated-inputs
>       `(("glib" ,glib))) ; required by polkit-gobject-1.pc
> @@ -90,8 +90,16 @@
>         ("intltool" ,intltool)
>         ("gobject-introspection" ,gobject-introspection)))
>      (arguments
> -     `(#:configure-flags '("--sysconfdir=/etc"
> -                           "--enable-man-pages")
> +     `(#:configure-flags
> +       (let ((libjs (assoc-ref %build-inputs "mozjs-17")))
> +         (list
> +           "--sysconfdir=/etc"
> +           "--enable-man-pages"
> +           ;; FIXME: Make this use pkg-config
> +           (string-append "LIBJS_CFLAGS="
> +                          "-include " libjs "/include/js-./js/RequiredDefines.h"
> +                          " -I" libjs "/include/js-.")
> +           (string-append "LIBJS_LIBS=-L" libjs "/lib -lmozjs-.")))
>         #:phases
>         (modify-phases %standard-phases
>           (add-after
Hi, I have push a commit to fix the version script of mozjs, it should
install correctly now. 

Re: [PATCH 1/1] gnu: polkit: Fix detection of mozjs-17.

[Leo Famulari]

On Fri, Jan 22, 2016 at 06:58:40PM +0800, 宋文武 wrote:
> Hi, I have push a commit to fix the version script of mozjs, it should
> install correctly now. 
> 

Thanks, that seems like the right way!