[gnome-build-meta] Revert "Remove mozjs60 and switch polkit to mozjs68"



commit 9f94ddde99da543fd6f7302f5e7b8af5bf60df59
Author: Michael Catanzaro <mcatanzaro gnome org>
Date:   Mon Jul 6 23:30:55 2020 +0000

    Revert "Remove mozjs60 and switch polkit to mozjs68"
    
    This reverts commit def7727d005b0f75dd0f08be88b00fdb5336288c

 elements/core-deps.bst         |  1 +
 elements/core-deps/mozjs60.bst | 26 ++++++++++++++++++++++++++
 elements/core-deps/polkit.bst  |  2 +-
 3 files changed, 28 insertions(+), 1 deletion(-)
---
diff --git a/elements/core-deps.bst b/elements/core-deps.bst
index 547abae2..4a30665d 100644
--- a/elements/core-deps.bst
+++ b/elements/core-deps.bst
@@ -92,6 +92,7 @@ depends:
 - core-deps/mm-common.bst
 - core-deps/mobile-broadband-provider-info.bst
 - core-deps/mogwai.bst
+- core-deps/mozjs60.bst
 - core-deps/mpc.bst
 - core-deps/mpfr.bst
 - core-deps/ndctl.bst
diff --git a/elements/core-deps/mozjs60.bst b/elements/core-deps/mozjs60.bst
new file mode 100644
index 00000000..e9d542f7
--- /dev/null
+++ b/elements/core-deps/mozjs60.bst
@@ -0,0 +1,26 @@
+kind: manual
+sources:
+- kind: tar
+  url: gnome_download:teams/releng/tarballs-needing-help/mozjs/mozjs-60.8.0.tar.bz2
+build-depends:
+- sdk/python2.bst
+- freedesktop-sdk.bst:components/autoconf.bst
+- freedesktop-sdk.bst:components/perl.bst
+depends:
+- freedesktop-sdk.bst:bootstrap-import.bst
+variables:
+  mozjs_target: ''
+  (?):
+  - arch == "i686":
+      mozjs_target: --host=i686-unknown-linux-gnu
+  - arch == "arm":
+      mozjs_target: --host=arm-unknown-linux-gnueabi
+  command-subdir: _build
+config:
+  configure-commands:
+  -  ../js/src/configure --prefix=%{prefix} --libdir=%{libdir} --disable-jemalloc AUTOCONF=autoconf 
%{mozjs_target}
+  build-commands:
+  - make
+  install-commands:
+  - make -j1 DESTDIR="%{install-root}" install
+  - rm %{install-root}%{libdir}/libjs_static.ajs
diff --git a/elements/core-deps/polkit.bst b/elements/core-deps/polkit.bst
index 645adab1..6892929c 100644
--- a/elements/core-deps/polkit.bst
+++ b/elements/core-deps/polkit.bst
@@ -16,7 +16,7 @@ build-depends:
 
 depends:
 - sdk/gobject-introspection.bst
-- sdk/mozjs68.bst
+- core-deps/mozjs60.bst
 - freedesktop-sdk.bst:components/linux-pam.bst
 - freedesktop-sdk.bst:components/systemd.bst
 - freedesktop-sdk.bst:bootstrap-import.bst


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]