[gnome-continuous] manifest: build graphene with meson
- From: Javier Jardón Cabezas <jjardon src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-continuous] manifest: build graphene with meson
- Date: Sun, 26 Feb 2017 00:32:46 +0000 (UTC)
commit 81917cf5efda3d22ee7932697eea54b44b780275
Author: Javier Jardón <jjardon gnome org>
Date: Sun Feb 26 00:30:05 2017 +0000
manifest: build graphene with meson
manifest.json | 3 ++-
patches/graphene-build-api.patch | 10 +++++-----
2 files changed, 7 insertions(+), 6 deletions(-)
---
diff --git a/manifest.json b/manifest.json
index d5b566d..c4024f1 100644
--- a/manifest.json
+++ b/manifest.json
@@ -605,7 +605,8 @@
"--disable-argyllcms-sensor",
"--disable-installed-tests"]},
- {"src": "ebassi:graphene"},
+ {"src": "ebassi:graphene"
+ "patches": ["graphene-build-api.patch"]},
{"src": "gnome:gconf",
"config-opts": ["--disable-orbit",
diff --git a/patches/graphene-build-api.patch b/patches/graphene-build-api.patch
index 55944aa..e8274b3 100644
--- a/patches/graphene-build-api.patch
+++ b/patches/graphene-build-api.patch
@@ -1,4 +1,4 @@
-From 2d482f90ba68ded3f301325c95b75e1a320969fb Mon Sep 17 00:00:00 2001
+From e11ef177c61ba0150c47c0ab8dff46569fc7ea59 Mon Sep 17 00:00:00 2001
From: Emmanuele Bassi <ebassi gnome org>
Date: Mon, 20 Feb 2017 11:33:49 +0000
Subject: [PATCH] Add build-api wrapper for Meson/Ninja
@@ -14,7 +14,7 @@ v2:
diff --git a/configure b/configure
new file mode 100755
-index 0000000..157ad9c
+index 000000000..33bca5167
--- /dev/null
+++ b/configure
@@ -0,0 +1,130 @@
@@ -113,7 +113,7 @@ index 0000000..157ad9c
+# Generated by configure; do not edit
+
+all:
-+ CCACHE_DISABLE=1 ${NINJA}
++ CC=gcc CXX=g++ ${NINJA}
+
+install:
+ DESTDIR="\$(DESTDIR)" ${NINJA} install
@@ -133,7 +133,7 @@ index 0000000..157ad9c
+echo " mandir:...... ${mandir}"
+echo " includedir:.. ${includedir}"
+
-+export CCACHE_DISABLE=1
++export CC=gcc CXX=g++
+exec ${MESON} \
+ --prefix=${prefix} \
+ --libdir=${libdir} \
@@ -149,5 +149,5 @@ index 0000000..157ad9c
+
+# vim: ai ts=8 noet sts=2 ft=sh
--
-2.9.3
+2.11.1
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]