Attachment 68099 Details for Bug 55645 – [PATCH] Fix out-of-tree builds with intel-gen4asm installed

[patch] [PATCH] Fix out-of-tree builds with intel-gen4asm installed

0001-Fix-out-of-tree-builds-with-intel-gen4asm-installed.patch (text/plain), 1.12 KB, created by Josh Triplett on 2012-10-05 00:51:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Josh Triplett

Created: 2012-10-05 00:51:16 UTC

Size: 1.12 KB

patch

obsolete

>From 263e605811c23da169c915670029d606bfb5048e Mon Sep 17 00:00:00 2001
>From: Josh Triplett <josh@joshtriplett.org>
>Date: Thu, 4 Oct 2012 17:48:24 -0700
>Subject: [PATCH] Fix out-of-tree builds with intel-gen4asm installed
>
>The make rules to compile shaders with intel-gen4asm referenced the .g4a
>source files without using $(srcdir), which broke out-of-tree builds.
>Reference .g4a source files via $(srcdir), and add $(srcdir) to m4's
>include path, fixing out-of-tree builds.
>
>Signed-off-by: Josh Triplett <josh@joshtriplett.org>
>---
> src/xvmc/shader/mc/Makefile.am |    2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
>diff --git a/src/xvmc/shader/mc/Makefile.am b/src/xvmc/shader/mc/Makefile.am
>index 891849b..7e3f5b4 100644
>--- a/src/xvmc/shader/mc/Makefile.am
>+++ b/src/xvmc/shader/mc/Makefile.am
>@@ -109,7 +109,7 @@ if HAVE_GEN4ASM
> 
> SUFFIXES = .g4a .g4b
> .g4a.g4b:
>-	m4 $*.g4a > $*.g4m && intel-gen4asm -o $@ $*.g4m && intel-gen4asm -g 5 -o $@.gen5 $*.g4m && rm $*.g4m
>+	m4 -I$(srcdir) $(srcdir)/$*.g4a > $*.g4m && intel-gen4asm -o $@ $*.g4m && intel-gen4asm -g 5 -o $@.gen5 $*.g4m && rm $*.g4m
> 
> $(INTEL_G4B): $(INTEL_G4I)
> 
>-- 
>1.7.10.4
>

Actions: View | Splinter Review

Attachments on bug 55645: 68099

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.