[Mesa-dev] [PATCH v2] gallium/swr: fold the almost identical Makefiles

Rowley, Timothy O timothy.o.rowley at intel.com
Wed Apr 13 20:09:32 UTC 2016


> On Apr 13, 2016, at 2:21 PM, Emil Velikov <emil.l.velikov at gmail.com> wrote:
> 
> On 13 April 2016 at 19:13, Rowley, Timothy O <timothy.o.rowley at intel.com> wrote:
>> Testing this, I needed to make the following change to install-gallium-links.mk to avoid a segfault while building.  If that’s the right approach, the egl_LTLIBRARIES line probably needs the same treatment for future proofing.
>> 
>> diff --git a/install-gallium-links.mk b/install-gallium-links.mk
>> index 4010cad..0aae905 100644
>> --- a/install-gallium-links.mk
>> +++ b/install-gallium-links.mk
>> @@ -14,7 +14,7 @@ all-local : .install-gallium-links
>>    $(MKDIR_P) $$link_dir;                  \
>>    file_list=$(dri_LTLIBRARIES:%.la=.libs/%.so);       \
>>    file_list+=$(egl_LTLIBRARIES:%.la=.libs/%.$(LIB_EXT)*); \
>> -   file_list+=$(lib_LTLIBRARIES:%.la=.libs/%.$(LIB_EXT)*); \
>> +   file_list+="$(lib_LTLIBRARIES:%.la=.libs/%.$(LIB_EXT)*)";   \
>>    for f in $$file_list; do                \
>>        if test -h .libs/$$f; then          \
>>            cp -d $$f $$link_dir;           \
>> 
> Ahh yes. The whitespace will cause bash to [attempt to] execute the
> LTLIBRARIES and things will go crazy.
> Can you please send a patch that updates the whole file ?

Sent a patch along those lines to mesa-dev.

>>> On Apr 13, 2016, at 9:38 AM, Emil Velikov <emil.l.velikov at gmail.com> wrote:
>>> 
>>> From: Emil Velikov <emil.velikov at collabora.com>
>>> 
>>> Rather than having two almost identical Makefiles, with various VPATH
>>> hacks just fold them, using COMMON_* variables and actually getting
>>> things buildable/shipable.
>>> 
>>> v2: whitespace fixes, remove Makefile.sources-arch
>>> 
>>> Cc: Tim Rowley <timothy.o.rowley at intel.com>
>>> Signed-off-by: Emil Velikov <emil.velikov at collabora.com>
> I take it that I've not butched things with v2 and the r-b still holds ?

Yes, still stands.  Reviewed-by: Tim Rowley <timothy.o.rowley at intel.com>

-Tim



More information about the mesa-dev mailing list