[Mesa-dev] [PATCH] gallium/opencl: Fix out-of-tree build

[Matt Turner]

On Tue, Apr 9, 2013 at 2:28 AM, Niels Ole Salscheider
<niels_ole at salscheider-online.de> wrote:
> Am Dienstag, 9. April 2013, 11:17:39 schrieb Michel Dänzer:
>> From: Michel Dänzer <michel.daenzer at amd.com>
>>
>>
>> Signed-off-by: Michel Dänzer <michel.daenzer at amd.com>
>> ---
>>  src/gallium/targets/opencl/Makefile.am | 4 ++--
>>  1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/src/gallium/targets/opencl/Makefile.am
>> b/src/gallium/targets/opencl/Makefile.am index 389eecc..810f9bb 100644
>> --- a/src/gallium/targets/opencl/Makefile.am
>> +++ b/src/gallium/targets/opencl/Makefile.am
>> @@ -32,11 +32,11 @@ libOpenCL_la_SOURCES =
>>  # Force usage of a C++ linker
>>  nodist_EXTRA_libOpenCL_la_SOURCES = dummy.cpp
>>
>> -PIPE_SRC_DIR = $(top_srcdir)/src/gallium/targets/pipe-loader
>> +PIPE_BUILD_DIR = $(top_builddir)/src/gallium/targets/pipe-loader
>>
>>  # Provide compatibility with scripts for the old Mesa build system for
>>  # a while by putting a link to the driver into /lib of the build tree.
>>  all-local: libOpenCL.la
>> -       @$(MAKE) -C $(PIPE_SRC_DIR)
>> +       @$(MAKE) -C $(PIPE_BUILD_DIR)
>>         $(MKDIR_P) $(top_builddir)/$(LIB_DIR)
>>         ln -f .libs/libOpenCL.so* $(top_builddir)/$(LIB_DIR)/
>> --
>> 1.8.2
>
> I sent that patch to the list on 24.02.2013, but Matt Turner said that he has
> a better solution that does not involve calling make...

Sorry for not handling it sooner. I really don't enjoy doing automake
stuff -- it's hard to find the motivation to push through a big series
that has even a small chance of breaking anything. I expected to get
to finishing that series sooner when I emailed you.

Michel, if you want to commit Niels' patch I'd be grateful. Whenever I
get back to my series, I can easily enough rebase it.