[PATCH v5 xserver 7/6] tests: fix --disable-xorg build

Jon Turney jon.turney at dronecode.org.uk
Mon Jan 16 15:46:51 UTC 2017


On 14/01/2017 10:19, Mihail Konev wrote:
> Commit ead5064581665ff40c177dd1b447949f1420e209 missed that xi1/
> and xi2/ were conditioned on XORG, and made xfree86-only tests to be
> built unconditionally.
> Ifdef the tests and split tests_SOURCES.
>
> Commit 704a867f8fb7652a8b7d5569bbe44e188457db4e missed that when
> XORG is false, libxservertest.la isn't linked into anything.
> However, before putting them into tests_LDADD, its static libraries
> likely need to be reordered for linking not to fail.
> Remove the former libxservertest.la for !XORG, as its build was only
> triggered by 'make check'.
> XSERVER_LIBS were depending on it; remove them too.
>
> Commit 23f6dbc96e47be6cbeed78cc9ef303987c3e29a9 missed that -wrap
> arguments to 'ld' could only be present when HAVE_LD_WRAP is true.

Can we see these 3 things as separate patches, please?

Something is definitely needed to fix static linkage, but I can't really 
see what you've done when it's jumbled in with other stuff.
(and hidden under a title of 'fix --disable-xorg build'.



More information about the xorg-devel mailing list