[gnome-continuous] Enforce the C compiler for json-glib
- From: Javier Jardón Cabezas <jjardon src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-continuous] Enforce the C compiler for json-glib
- Date: Wed, 5 Apr 2017 10:20:58 +0000 (UTC)
commit d177a30b41cc9174a512a0e39222b7da60ef7120
Author: Javier Jardón <jjardon gnome org>
Date: Wed Apr 5 11:19:55 2017 +0100
Enforce the C compiler for json-glib
Otherwise CCache will be detected and will try to create a cache
directory under the wrong prefix.
This is same solution as the one applied in commit
c8ea85323b8fa768b9c948b29d103a0028d331c1
for json-glib
manifest.json | 3 +-
patches/gnome-power-manager-compiler.patch | 37 ++++++++++++++++++++++++++++
2 files changed, 39 insertions(+), 1 deletions(-)
---
diff --git a/manifest.json b/manifest.json
index c96db28..42d4e44 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1113,7 +1113,8 @@
{"src": "gnome:caribou",
"config-opts": ["PYTHON=python3"]},
- {"src": "gnome:gnome-power-manager"},
+ {"src": "gnome:gnome-power-manager",
+ "patches": ["gnome-power-manager-compiler.patch"]},
{"src": "gnome:gnome-shell",
"irc_room": "gnome-shell",
diff --git a/patches/gnome-power-manager-compiler.patch b/patches/gnome-power-manager-compiler.patch
new file mode 100644
index 0000000..dc188b3
--- /dev/null
+++ b/patches/gnome-power-manager-compiler.patch
@@ -0,0 +1,37 @@
+From a11204cc92142ac5db2c16d089e61457c6a08d12 Mon Sep 17 00:00:00 2001
+From: Emmanuele Bassi <ebassi gnome org>
+Date: Sat, 18 Mar 2017 17:28:49 +0000
+Subject: [PATCH] Enforce gcc as the compiler
+
+Otherwise Continuous will attempt to use ccache with a read-only file
+system:
+
+ccache: error: Failed to create directory //.ccache/tmp: Read-only file system
+---
+ configure | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/configure b/configure
+index b2a07543..cdc436d4 100755
+--- a/configure
++++ b/configure
+@@ -103,7 +103,7 @@ cat > Makefile <<END
+ # Generated by configure; do not edit
+
+ all:
+- CC="\$(CC)" CXX="\$(CXX)" ${NINJA}
++ CC="gcc" ${NINJA}
+
+ install:
+ DESTDIR="\$(DESTDIR)" ${NINJA} install
+@@ -125,6 +125,7 @@ echo " includedir:.. ${includedir}"
+ echo " additional:.."
+ echo " - ${enable_docs} ${enable_man} ${enable_introspection}"
+
++export CC=gcc
+ exec ${MESON} \
+ --prefix=${prefix} \
+ --libdir=${libdir} \
+--
+2.12.1
+
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]