[gnome-continuous] patches/gstreamer-build-api.patch: put CC=gcc CXX=g++ in front of Meson and Ninja
- From: Javier Jardón Cabezas <jjardon src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-continuous] patches/gstreamer-build-api.patch: put CC=gcc CXX=g++ in front of Meson and Ninja
- Date: Sat, 25 Feb 2017 23:56:01 +0000 (UTC)
commit efe54e0b75216f54bd9f6ae4f3b62e7d9a64ef16
Author: Javier Jardón <jjardon gnome org>
Date: Sat Feb 25 23:54:01 2017 +0000
patches/gstreamer-build-api.patch: put CC=gcc CXX=g++ in front of Meson and Ninja
Try to workaround https://github.com/mesonbuild/meson/issues/1035
patches/gstreamer-build-api.patch | 17 ++++++++---------
1 files changed, 8 insertions(+), 9 deletions(-)
---
diff --git a/patches/gstreamer-build-api.patch b/patches/gstreamer-build-api.patch
index 55944aa..1860dc8 100644
--- a/patches/gstreamer-build-api.patch
+++ b/patches/gstreamer-build-api.patch
@@ -1,4 +1,4 @@
-From 2d482f90ba68ded3f301325c95b75e1a320969fb Mon Sep 17 00:00:00 2001
+From 1d2b3950f63259399a220f5db2882bd4bd4bc008 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
@@ -8,16 +8,16 @@ Use Meson and Ninja, instead of autotools.
v2:
- Disable CCache
---
- configure | 130 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 130 insertions(+)
+ configure | 129 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 129 insertions(+)
create mode 100755 configure
diff --git a/configure b/configure
new file mode 100755
-index 0000000..157ad9c
+index 000000000..eed78b1ee
--- /dev/null
+++ b/configure
-@@ -0,0 +1,130 @@
+@@ -0,0 +1,129 @@
+#!/bin/bash
+# configure script adapter for Meson
+# Copyright 2010, 2011, 2013 Colin Walters <walters verbum org>
@@ -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,8 +133,7 @@ index 0000000..157ad9c
+echo " mandir:...... ${mandir}"
+echo " includedir:.. ${includedir}"
+
-+export CCACHE_DISABLE=1
-+exec ${MESON} \
++exec CC=gcc CXX=g++ ${MESON} \
+ --prefix=${prefix} \
+ --libdir=${libdir} \
+ --libexecdir=${libexecdir} \
@@ -149,5 +148,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]