[gnome-continuous] manifest: Create mozjs38 makefile in builddir
- From: Philip Chimento <pchimento src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-continuous] manifest: Create mozjs38 makefile in builddir
- Date: Wed, 15 Feb 2017 23:00:17 +0000 (UTC)
commit 647834fd33e83248b91151a5ec3471edc8aeedda
Author: Philip Chimento <philip endlessm com>
Date: Wed Feb 15 14:59:26 2017 -0800
manifest: Create mozjs38 makefile in builddir
Also, since I've rewritten the whole patch by this point, may as well put
my name on it
manifest.json | 2 +-
patches/mozjs38-buildapi.patch | 30 ++++++++++++------------------
2 files changed, 13 insertions(+), 19 deletions(-)
---
diff --git a/manifest.json b/manifest.json
index 4b0ed87..bd591ba 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1389,7 +1389,7 @@
"initramfs-build-epoch": {"version": 0},
- "build-epoch": {"version": 118,
+ "build-epoch": {"version": 119,
"all": false,
"component-names": [ "mozjs38" ]}
}
diff --git a/patches/mozjs38-buildapi.patch b/patches/mozjs38-buildapi.patch
index aa4cad5..74ce483 100644
--- a/patches/mozjs38-buildapi.patch
+++ b/patches/mozjs38-buildapi.patch
@@ -1,34 +1,28 @@
From 2134f0387c3fd24413a7c49b1b26c52e21ec7c46 Mon Sep 17 00:00:00 2001
-From: Colin Walters <walters verbum org>
-Date: Wed, 18 Jan 2012 22:25:47 -0500
+From: Philip Chimento <philip endlessm com>
+Date: Wed, 15 Feb 2017 14:57:47 -0800
Subject: [PATCH] build: Add toplevel trampoline configure/Makefile
These just invoke the ones in js/src.
---
- Makefile | 5 +++++
- configure | 5 +++++
- 2 files changed, 10 insertions(+), 0 deletions(-)
- create mode 100644 Makefile
+ configure | 12 ++++++++++++
+ 1 file changed, 12 insertions(+), 0 deletions(-)
create mode 100755 configure
-diff --git a/Makefile b/Makefile
-new file mode 100644
-index 0000000..98de844
---- /dev/null
-+++ b/Makefile
-@@ -0,0 +1,5 @@
-+all:
-+ cd js/src && $(MAKE)
-+
-+install:
-+ cd js/src && $(MAKE) install DESTDIR=$(DESTDIR)
diff --git a/configure b/configure
new file mode 100755
index 0000000..93ef339
--- /dev/null
+++ b/configure
-@@ -0,0 +1,5 @@
+@@ -0,0 +1,12 @@
+#!/bin/sh -x
++cat >Makefile <<ENDMAKEFILE
++all:
++ cd js/src && $(MAKE)
++
++install:
++ cd js/src && $(MAKE) install DESTDIR=$(DESTDIR)
++ENDMAKEFILE
+srcdir=$(readlink -f $(dirname $0))
+mkdir -p js/src
+cd js/src
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]