XLibre/xf86-video-intel
1
0
Fork 0
mirror of https://github.com/X11Libre/xf86-video-intel.git synced 2026-04-14 10:54:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use path for intel-gen4asm derived from pkg-config

Browse Source 
As we use pkg-config to determine whether to use intel-gen4asm, we
should also use it to locate the right version of intel-gen4asm to use.
This allows the user to install the assembler in a non-standard path for
cross-builds and similar.

Reported-by: Josh Tripplet <josh@freedesktop.org>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=55646
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
This commit is contained in:
Chris Wilson
2012-10-07 10:46:19 +01:00
parent 249051d90f
commit 4d2dba0ba7
4 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
configure.ac
View File

@@ -93,6 +93,15 @@ if test x$ASM != "xno"; then
if test x$ASM = "xyes" -a x$gen4asm != "xyes"; then
AC_MSG_ERROR([intel-gen4asm support requested but not found])
fi
if test x$gen4asm = "xyes"; then
AC_MSG_CHECKING([path to use for intel-gen4asm])
INTEL_GEN4ASM="`pkg-config intel-gen4asm --variable=exec_prefix`/bin/intel-gen4asm"
if ! test -e "$INTEL_GEN4ASM"; then
AC_MSG_ERROR([intel-gen4asm enabled, but not found. Tried '$INTEL_GEN4ASM'.])
fi
AC_MSG_RESULT([$INTEL_GEN4ASM])
AC_SUBST([INTEL_GEN4ASM])
fi
fi
AM_CONDITIONAL(HAVE_GEN4ASM, test x$gen4asm = xyes)

8
src/render_program/Makefile.am
View File

@@ -191,16 +191,16 @@ if HAVE_GEN4ASM
SUFFIXES = .g4a .g4b .g5a .g5b .g6a .g6b .g7a .g7b
.g4a.g4b:
m4 -I$(srcdir) -s $< > $*.g4m && intel-gen4asm -o $@ $*.g4m && intel-gen4asm -g 5 -o $@.gen5 $*.g4m && rm $*.g4m
m4 -I$(srcdir) -s $< > $*.g4m && @INTEL_GEN4ASM@ -o $@ $*.g4m && @INTEL_GEN4ASM@ -g 5 -o $@.gen5 $*.g4m && rm $*.g4m
.g5a.g5b:
m4 -I$(srcdir) -s $< > $*.g5m && intel-gen4asm -g 5 -o $@ $*.g5m && rm $*.g5m
m4 -I$(srcdir) -s $< > $*.g5m && @INTEL_GEN4ASM@ -g 5 -o $@ $*.g5m && rm $*.g5m
.g6a.g6b:
m4 -I$(srcdir) -s $< > $*.g6m && intel-gen4asm -g 6 -o $@ $*.g6m && rm $*.g6m
m4 -I$(srcdir) -s $< > $*.g6m && @INTEL_GEN4ASM@ -g 6 -o $@ $*.g6m && rm $*.g6m
.g7a.g7b:
m4 -I$(srcdir) -s $< > $*.g7m && intel-gen4asm -g 7 -o $@ $*.g7m && rm $*.g7m
m4 -I$(srcdir) -s $< > $*.g7m && @INTEL_GEN4ASM@ -g 7 -o $@ $*.g7m && rm $*.g7m
$(INTEL_G4B): $(INTEL_G4I)
$(INTEL_G5B): $(INTEL_G4I)

2
src/xvmc/shader/mc/Makefile.am
View File

@@ -109,7 +109,7 @@ if HAVE_GEN4ASM
SUFFIXES = .g4a .g4b
.g4a.g4b:
m4 -I$(srcdir) $(srcdir)/$*.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)

2
src/xvmc/shader/vld/Makefile.am
View File

@@ -62,7 +62,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 $*.g4a > $*.g4m && @INTEL_GEN4ASM@ -o $@ $*.g4m && @INTEL_GEN4ASM@ -g 5 -o $@.gen5 $*.g4m && rm $*.g4m
$(INTEL_G4B): $(INTEL_G4I)