All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH 1/2] mesa: fix out-of-tree builds when Gallium is enabled
@ 2013-08-08 16:29 Ross Burton
  2013-08-08 16:29 ` [PATCH 2/2] seperatebuilddir: mesa now builds out of tree Ross Burton
  2013-08-09  0:53 ` [PATCH 1/2] mesa: fix out-of-tree builds when Gallium is enabled Saul Wold
  0 siblings, 2 replies; 5+ messages in thread
From: Ross Burton @ 2013-08-08 16:29 UTC (permalink / raw)
  To: openembedded-core


Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 .../mesa/0005-fix-out-of-tree-builds-gallium.patch |   42 ++++++++++++++++++++
 meta/recipes-graphics/mesa/mesa_9.1.6.bb           |    1 +
 meta/recipes-graphics/mesa/mesa_git.bb             |    1 +
 3 files changed, 44 insertions(+)
 create mode 100644 meta/recipes-graphics/mesa/mesa/0005-fix-out-of-tree-builds-gallium.patch

diff --git a/meta/recipes-graphics/mesa/mesa/0005-fix-out-of-tree-builds-gallium.patch b/meta/recipes-graphics/mesa/mesa/0005-fix-out-of-tree-builds-gallium.patch
new file mode 100644
index 0000000..8c5984f
--- /dev/null
+++ b/meta/recipes-graphics/mesa/mesa/0005-fix-out-of-tree-builds-gallium.patch
@@ -0,0 +1,42 @@
+Upstream-Status: Submitted
+Signed-off-by: Ross Burton <ross.burton@intel.com>
+
+From 9e31e15ebb0adbf3cc0394c30cbc1ccd2b35a27f Mon Sep 17 00:00:00 2001
+From: Ross Burton <ross.burton@intel.com>
+Date: Fri, 28 Jun 2013 11:44:58 +0100
+Subject: [PATCH] build: fix out-of-tree builds in gallium/auxiliary
+
+The rules were writing files to e.g. util/u_indices_gen.py, but in an
+out-of-tree build this directory doesn't exist in the build directory.  So,
+create the directories just in case.
+
+Signed-off-by: Ross Burton <ross.burton@intel.com>
+---
+ src/gallium/auxiliary/Makefile.am |    4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/gallium/auxiliary/Makefile.am b/src/gallium/auxiliary/Makefile.am
+index f14279b..0c3e7ba 100644
+--- a/src/gallium/auxiliary/Makefile.am
++++ b/src/gallium/auxiliary/Makefile.am
+@@ -38,13 +38,17 @@ libgallium_la_SOURCES += \
+ endif
+ 
+ indices/u_indices_gen.c: $(srcdir)/indices/u_indices_gen.py
++	mkdir --parents indices
+ 	$(AM_V_GEN) $(PYTHON2) $< > $@
+ 
+ indices/u_unfilled_gen.c: $(srcdir)/indices/u_unfilled_gen.py
++	mkdir --parents indices
+ 	$(AM_V_GEN) $(PYTHON2) $< > $@
+ 
+ util/u_format_srgb.c: $(srcdir)/util/u_format_srgb.py
++	mkdir --parents util
+ 	$(AM_V_GEN) $(PYTHON2) $< > $@
+ 
+ util/u_format_table.c: $(srcdir)/util/u_format_table.py $(srcdir)/util/u_format_pack.py $(srcdir)/util/u_format_parse.py $(srcdir)/util/u_format.csv
++	mkdir --parents util
+ 	$(AM_V_GEN) $(PYTHON2) $(srcdir)/util/u_format_table.py $(srcdir)/util/u_format.csv > $@
+-- 
+1.7.10.4
+
diff --git a/meta/recipes-graphics/mesa/mesa_9.1.6.bb b/meta/recipes-graphics/mesa/mesa_9.1.6.bb
index d47822f..7cc0847 100644
--- a/meta/recipes-graphics/mesa/mesa_9.1.6.bb
+++ b/meta/recipes-graphics/mesa/mesa_9.1.6.bb
@@ -6,6 +6,7 @@ SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2 \
            file://0003-EGL-Mutate-NativeDisplayType-depending-on-config.patch \
            file://0004-glsl-fix-builtin_compiler-cross-compilation.patch \
            file://0005-llvmpipe-remove-the-power-of-two-sizeof-struct-cmd_b.patch \
+           file://0005-fix-out-of-tree-builds-gallium.patch \
            "
 
 SRC_URI[md5sum] = "443a2a352667294b53d56cb1a74114e9"
diff --git a/meta/recipes-graphics/mesa/mesa_git.bb b/meta/recipes-graphics/mesa/mesa_git.bb
index 52d3d81..1707f03 100644
--- a/meta/recipes-graphics/mesa/mesa_git.bb
+++ b/meta/recipes-graphics/mesa/mesa_git.bb
@@ -13,6 +13,7 @@ SRC_URI = "git://anongit.freedesktop.org/git/mesa/mesa;protocol=git \
            file://0002-pipe_loader_sw-include-xlib_sw_winsys.h-only-when-HA.patch \
            file://0003-EGL-Mutate-NativeDisplayType-depending-on-config.patch \
            file://0004-glsl-fix-builtin_compiler-cross-compilation.patch \
+           file://0005-fix-out-of-tree-builds-gallium.patch \
            "
 
 S = "${WORKDIR}/git"
-- 
1.7.10.4



^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [PATCH 0/2] Enable out-of-tree builds for Mesa
@ 2013-08-06 11:18 Ross Burton
  2013-08-06 11:18 ` [PATCH 1/2] mesa: fix out-of-tree builds when Gallium is enabled Ross Burton
  0 siblings, 1 reply; 5+ messages in thread
From: Ross Burton @ 2013-08-06 11:18 UTC (permalink / raw)
  To: openembedded-core

Hi,

Attached is a two-patch series to enable out-of-tree build for Mesa.

Ross

The following changes since commit 4cff3defb545643132b7233fcffb3fedc1bf182b:

  grep: Add patch for texinfo 5.1 (2013-08-03 10:33:14 +0100)

are available in the git repository at:

  git://git.yoctoproject.org/poky-contrib ross/mesa

for you to fetch changes up to 653b8f2da86101031731b208b84a4ca4f91b5074:

  seperatebuilddir: mesa now builds out of tree (2013-08-06 12:16:55 +0100)

----------------------------------------------------------------
Ross Burton (2):
      mesa: fix out-of-tree builds when Gallium is enabled
      seperatebuilddir: mesa now builds out of tree

 meta/conf/distro/include/seperatebuilddir.inc      |    2 +-
 .../mesa/0005-fix-out-of-tree-builds-gallium.patch |   42 ++++++++++++++++++++
 meta/recipes-graphics/mesa/mesa_9.1.5.bb           |    1 +
 meta/recipes-graphics/mesa/mesa_git.bb             |    1 +
 4 files changed, 45 insertions(+), 1 deletion(-)
 create mode 100644 meta/recipes-graphics/mesa/mesa/0005-fix-out-of-tree-builds-gallium.patch

Ross Burton (2):
  mesa: fix out-of-tree builds when Gallium is enabled
  seperatebuilddir: mesa now builds out of tree

 meta/conf/distro/include/seperatebuilddir.inc      |    2 +-
 .../mesa/0005-fix-out-of-tree-builds-gallium.patch |   42 ++++++++++++++++++++
 meta/recipes-graphics/mesa/mesa_9.1.5.bb           |    1 +
 meta/recipes-graphics/mesa/mesa_git.bb             |    1 +
 4 files changed, 45 insertions(+), 1 deletion(-)
 create mode 100644 meta/recipes-graphics/mesa/mesa/0005-fix-out-of-tree-builds-gallium.patch

-- 
1.7.10.4



^ permalink raw reply	[flat|nested] 5+ messages in thread
end of thread, other threads:[~2013-08-09  0:53 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-08-08 16:29 [PATCH 1/2] mesa: fix out-of-tree builds when Gallium is enabled Ross Burton
2013-08-08 16:29 ` [PATCH 2/2] seperatebuilddir: mesa now builds out of tree Ross Burton
2013-08-08 16:32   ` Otavio Salvador
2013-08-09  0:53 ` [PATCH 1/2] mesa: fix out-of-tree builds when Gallium is enabled Saul Wold
  -- strict thread matches above, loose matches on Subject: below --
2013-08-06 11:18 [PATCH 0/2] Enable out-of-tree builds for Mesa Ross Burton
2013-08-06 11:18 ` [PATCH 1/2] mesa: fix out-of-tree builds when Gallium is enabled Ross Burton

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.