--- This patch is necessary because gbm and clover use same pipe_*. In current automake they are installed only in $(libdir)/gbm and clover searches in $(libdir)/opencl and of course this cannot work.
The build is triggered by src/gallium/targets/gbm/Makefile.am:23 or src/gallium/targets/opencl/Makefile.am:12. Successfully tested with clover. Should also work with gbm. --- src/gallium/state_trackers/clover/Makefile.am | 6 ++++-- src/gallium/targets/gbm/Makefile.am | 2 +- src/gallium/targets/pipe-loader/Makefile.am | 20 ++++++++++---------- 3 Dateien geändert, 15 Zeilen hinzugefügt(+), 13 Zeilen entfernt(-) diff --git a/src/gallium/state_trackers/clover/Makefile.am b/src/gallium/state_trackers/clover/Makefile.am index f068164..7cfccf6 100644 --- a/src/gallium/state_trackers/clover/Makefile.am +++ b/src/gallium/state_trackers/clover/Makefile.am @@ -3,7 +3,7 @@ AUTOMAKE_OPTIONS = subdir-objects AM_CPPFLAGS = \ $(GALLIUM_PIPE_LOADER_DEFINES) \ -DMESA_VERSION=\"$(MESA_VERSION)\" \ - -DPIPE_SEARCH_DIR=\"$(OPENCL_LIB_INSTALL_DIR)\" \ + -DPIPE_SEARCH_DIR=\"$(libdir)/gallium-pipe\" \ -I$(top_srcdir)/include \ -I$(top_srcdir)/src/gallium/include \ -I$(top_srcdir)/src/gallium/drivers \ diff --git a/src/gallium/targets/gbm/Makefile.am b/src/gallium/targets/gbm/Makefile.am index 28cf455..cd860d7 100644 --- a/src/gallium/targets/gbm/Makefile.am +++ b/src/gallium/targets/gbm/Makefile.am @@ -8,7 +8,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/gbm/main \ -I$(top_srcdir)/src/gallium/winsys \ $(GALLIUM_PIPE_LOADER_DEFINES) \ - -DPIPE_SEARCH_DIR=\"$(gbmdir)\" + -DPIPE_SEARCH_DIR=\"$(libdir)/gallium-pipe\" AM_CFLAGS = \ $(GALLIUM_CFLAGS) \ diff --git a/src/gallium/targets/pipe-loader/Makefile.am b/src/gallium/targets/pipe-loader/Makefile.am index d02d1ae..bff92a0 100644 --- a/src/gallium/targets/pipe-loader/Makefile.am +++ b/src/gallium/targets/pipe-loader/Makefile.am @@ -10,8 +10,8 @@ AM_CPPFLAGS = \ -DGALLIUM_TRACE \ -DGALLIUM_GALAHAD -gbmdir = $(libdir)/gbm -gbm_LTLIBRARIES = +pipedir = $(libdir)/gallium-pipe +pipe_LTLIBRARIES = PIPE_LIBS = \ $(top_builddir)/src/gallium/auxiliary/libgallium.la \ @@ -27,7 +27,7 @@ endif if HAVE_GALLIUM_I915 -gbm_LTLIBRARIES += pipe_i915.la +pipe_LTLIBRARIES += pipe_i915.la pipe_i915_la_SOURCES = pipe_i915.c pipe_i915_la_LIBADD = \ $(PIPE_LIBS) \ @@ -44,7 +44,7 @@ endif endif if HAVE_GALLIUM_NOUVEAU -gbm_LTLIBRARIES += pipe_nouveau.la +pipe_LTLIBRARIES += pipe_nouveau.la pipe_nouveau_la_SOURCES = pipe_nouveau.c nodist_EXTRA_pipe_nouveau_la_SOURCES = dummy.cpp pipe_nouveau_la_LIBADD = \ @@ -63,7 +63,7 @@ endif endif if HAVE_GALLIUM_R300 -gbm_LTLIBRARIES += pipe_r300.la +pipe_LTLIBRARIES += pipe_r300.la pipe_r300_la_SOURCES = pipe_r300.c nodist_EXTRA_pipe_r300_la_SOURCES = dummy.cpp pipe_r300_la_LIBADD = \ @@ -81,7 +81,7 @@ endif endif if HAVE_GALLIUM_R600 -gbm_LTLIBRARIES += pipe_r600.la +pipe_LTLIBRARIES += pipe_r600.la pipe_r600_la_SOURCES = pipe_r600.c pipe_r600_la_LIBADD = \ $(PIPE_LIBS) \ @@ -98,7 +98,7 @@ endif endif if HAVE_GALLIUM_RADEONSI -gbm_LTLIBRARIES += pipe_radeonsi.la +pipe_LTLIBRARIES += pipe_radeonsi.la pipe_radeonsi_la_SOURCES = pipe_radeonsi.c nodist_EXTRA_pipe_radeonsi_la_SOURCES = dummy.cpp pipe_radeonsi_la_LIBADD = \ @@ -115,7 +115,7 @@ endif endif if HAVE_GALLIUM_SVGA -gbm_LTLIBRARIES += pipe_vmwgfx.la +pipe_LTLIBRARIES += pipe_vmwgfx.la pipe_vmwgfx_la_SOURCES = pipe_vmwgfx.c pipe_vmwgfx_la_LIBADD = \ $(PIPE_LIBS) \ @@ -131,7 +131,7 @@ endif endif if HAVE_GALLIUM_LLVMPIPE -gbm_LTLIBRARIES += pipe_swrast.la +pipe_LTLIBRARIES += pipe_swrast.la pipe_swrast_la_SOURCES = pipe_swrast.c nodist_EXTRA_pipe_swrast_la_SOURCES = dummy.cpp pipe_swrast_la_LIBADD = \ @@ -141,7 +141,7 @@ pipe_swrast_la_LIBADD = \ pipe_swrast_la_LDFLAGS = -no-undefined -avoid-version -module $(LLVM_LDFLAGS) else if HAVE_GALLIUM_SOFTPIPE -gbm_LTLIBRARIES += pipe_swrast.la +pipe_LTLIBRARIES += pipe_swrast.la pipe_swrast_la_SOURCES = pipe_swrast.c pipe_swrast_la_LIBADD = \ $(PIPE_LIBS) \ _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev