[gnome-continuous] Enforce the C compiler for json-glib
- From: Emmanuele Bassi <ebassi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-continuous] Enforce the C compiler for json-glib
- Date: Sat, 18 Mar 2017 17:31:13 +0000 (UTC)
commit c8ea85323b8fa768b9c948b29d103a0028d331c1
Author: Emmanuele Bassi <ebassi gnome org>
Date: Sat Mar 18 17:30:23 2017 +0000
Enforce the C compiler for json-glib
Otherwise CCache will be detected and will try to create a cache
directory under the wrong prefix.
manifest.json | 3 ++-
patches/json-glib-compiler.patch | 37 +++++++++++++++++++++++++++++++++++++
2 files changed, 39 insertions(+), 1 deletions(-)
---
diff --git a/manifest.json b/manifest.json
index cfe673f..07c3431 100644
--- a/manifest.json
+++ b/manifest.json
@@ -680,7 +680,8 @@
{"src": "gnome:gnome-keyring",
"config-opts": ["--disable-doc"]},
- {"src": "gnome:json-glib"},
+ {"src": "gnome:json-glib",
+ "patches": ["json-glib-compiler.patch"]},
{"src": "gnome:libcroco"},
diff --git a/patches/json-glib-compiler.patch b/patches/json-glib-compiler.patch
new file mode 100644
index 0000000..77a8fbb
--- /dev/null
+++ b/patches/json-glib-compiler.patch
@@ -0,0 +1,37 @@
+From ba3476844ac99f690ed0a6b8f52049f2218880e1 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 b2a0754..cdc436d 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.9.3
+
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]