diff options
Diffstat (limited to 'recipes-support/spice')
-rw-r--r-- | recipes-support/spice/files/configure.ac-add-subdir-objects-to-AM_INIT_AUTOMAKE.patch | 29 | ||||
-rw-r--r-- | recipes-support/spice/spice_git.bb | 12 |
2 files changed, 37 insertions, 4 deletions
diff --git a/recipes-support/spice/files/configure.ac-add-subdir-objects-to-AM_INIT_AUTOMAKE.patch b/recipes-support/spice/files/configure.ac-add-subdir-objects-to-AM_INIT_AUTOMAKE.patch new file mode 100644 index 00000000..323ef52f --- /dev/null +++ b/recipes-support/spice/files/configure.ac-add-subdir-objects-to-AM_INIT_AUTOMAKE.patch @@ -0,0 +1,29 @@ +From 36efb79076420975f7fa7aa0b03a1fc282291b05 Mon Sep 17 00:00:00 2001 +From: Mark Asselstine <mark.asselstine@windriver.com> +Date: Tue, 25 Mar 2014 15:23:25 -0400 +Subject: [PATCH] configure.ac: add subdir-objects to AM_INIT_AUTOMAKE + +Without this you will get subdir-objects error which will cause +autoreconf to complete successfully. + +Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com> +--- + spice-common/configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/spice-common/configure.ac b/spice-common/configure.ac +index b5cb960..78f1360 100644 +--- a/spice-common/configure.ac ++++ b/spice-common/configure.ac +@@ -13,7 +13,7 @@ AC_CONFIG_AUX_DIR([build-aux]) + m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) + + # Checks for programs +-AM_INIT_AUTOMAKE([1.11 dist-xz no-dist-gzip tar-ustar foreign -Wall -Werror]) ++AM_INIT_AUTOMAKE([1.11 dist-xz no-dist-gzip tar-ustar foreign subdir-objects -Wall -Werror]) + AM_MAINTAINER_MODE + AM_SILENT_RULES([yes]) + LT_INIT +-- +1.8.3.2 + diff --git a/recipes-support/spice/spice_git.bb b/recipes-support/spice/spice_git.bb index 900259aa..24870a15 100644 --- a/recipes-support/spice/spice_git.bb +++ b/recipes-support/spice/spice_git.bb @@ -29,7 +29,10 @@ SRC_URI = "git://anongit.freedesktop.org/spice/spice;name=spice \ git://anongit.freedesktop.org/spice/spice-protocol;destsuffix=git/spice-common/spice-protocol;name=spice-protocol \ " -SRC_URI += "file://spice-fix-CVE-2013-4282.patch" +SRC_URI += " \ + file://spice-fix-CVE-2013-4282.patch \ + file://configure.ac-add-subdir-objects-to-AM_INIT_AUTOMAKE.patch \ + " S = "${WORKDIR}/git" @@ -37,9 +40,6 @@ inherit autotools gettext pythonnative python-dir pkgconfig DEPENDS += "python-native celt051 python-pyparsing jpeg pixman alsa-lib glib-2.0" -EXTRA_OECONF_append = " -Wnone" -EXTRA_AUTORECONF_append = " -Wnone" - export PYTHON="${STAGING_BINDIR_NATIVE}/python-native/python" export PYTHONPATH="${PKG_CONFIG_SYSROOT_DIR}${libdir}/python2.7/site-packages" @@ -56,6 +56,10 @@ LICENSE_${PN}-protocol = "BSD" FILES_${PN}-protocol += "${includedir}/spice-1" FILES_${PN}-protocol += "${datadir}/pkgconfig" +do_configure_prepend() { + mkdir -p ${S}/spice-common/spice-protocol/m4 +} + do_install_append() { cd ${S}/spice-common/spice-protocol oe_runmake DESTDIR="${D}" install |