summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Jansa <martin.jansa@gmail.com>2018-09-13 06:57:37 +0000
committerKhem Raj <raj.khem@gmail.com>2018-09-14 19:01:41 -0700
commitd347312b9a93eef3e1f0e5caa5291620c56a4b58 (patch)
treee562fd5eff9a72cb2fbc657608560fccb27e37b8
parentcff2f38874166085fe2b6cf8a75c53fe9a3a231c (diff)
downloadmeta-openembedded-d347312b9a93eef3e1f0e5caa5291620c56a4b58.tar.gz
spice: cleanup leftover patch from upgrade to 0.13.90
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--meta-networking/recipes-support/spice/spice/0001-build-allow-separated-src-and-build-dirs.patch33
-rw-r--r--meta-networking/recipes-support/spice/spice_git.bb4
2 files changed, 0 insertions, 37 deletions
diff --git a/meta-networking/recipes-support/spice/spice/0001-build-allow-separated-src-and-build-dirs.patch b/meta-networking/recipes-support/spice/spice/0001-build-allow-separated-src-and-build-dirs.patch
deleted file mode 100644
index 8d246cc7f..000000000
--- a/meta-networking/recipes-support/spice/spice/0001-build-allow-separated-src-and-build-dirs.patch
+++ /dev/null
@@ -1,33 +0,0 @@
1From 812a1a099cc48edcf1280fc329bf5330237f3cc2 Mon Sep 17 00:00:00 2001
2From: Mark Asselstine <mark.asselstine@windriver.com>
3Date: Thu, 1 May 2014 12:09:16 -0400
4Subject: [PATCH] build: allow separated src and build dirs
5
6We need to expland the list of include dirs to include the build dir since
7generated files will be created there instead of in the src dir.
8
9We also don't want to force using $srcdir for generated files as this will
10allow them to be created in the build dir. We account for the slight
11deviation in the generated files with expanded include paths.
12
13Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
14---
15 configure.ac | 2 +-
16 1 file changed, 1 insertion(+), 1 deletion(-)
17
18diff --git a/configure.ac b/configure.ac
19index 483dbfdf..7d990aaa 100644
20--- a/configure.ac
21+++ b/configure.ac
22@@ -138,7 +138,7 @@ dnl =========================================================================
23 dnl Check deps
24
25 AC_CONFIG_SUBDIRS([spice-common])
26-COMMON_CFLAGS='-I ${top_srcdir}/spice-common/ -I ${top_builddir}/spice-common/'
27+COMMON_CFLAGS='-I ${top_srcdir}/spice-common/ -I ${top_srcdir}/spice-common/common/ -I ${top_srcdir}/spice-common/spice-protocol/ -I ${top_builddir}/spice-common/'
28 COMMON_CFLAGS="$COMMON_CFLAGS -DG_LOG_DOMAIN=\\\"Spice\\\""
29 AC_SUBST(COMMON_CFLAGS)
30
31--
322.14.1
33
diff --git a/meta-networking/recipes-support/spice/spice_git.bb b/meta-networking/recipes-support/spice/spice_git.bb
index c7e4b0329..1ad46c2c3 100644
--- a/meta-networking/recipes-support/spice/spice_git.bb
+++ b/meta-networking/recipes-support/spice/spice_git.bb
@@ -27,10 +27,6 @@ SRC_URI = " \
27 file://0001-spice-fix-compile-fail-problem.patch \ 27 file://0001-spice-fix-compile-fail-problem.patch \
28" 28"
29 29
30FOO = "\
31 file://0001-build-allow-separated-src-and-build-dirs.patch \
32"
33
34S = "${WORKDIR}/git" 30S = "${WORKDIR}/git"
35 31
36inherit autotools gettext pythonnative python-dir pkgconfig 32inherit autotools gettext pythonnative python-dir pkgconfig