[PATCH xserver 0/4] meson building Xorg server on Cygwin

Jon Turney jon.turney at dronecode.org.uk
Tue Oct 10 13:27:41 UTC 2017


On 27/06/2017 17:45, Adam Jackson wrote:
> On Mon, 2017-06-26 at 14:54 +0100, Jon Turney wrote:
>> Additions to meson build for building the Xorg server on Cygwin (cf. changes
>> to autotools build in commit c7b16255)
>>
>> Note that 4/4 relies on a meson PR which is not yet accepted.
>>
>> Jon Turney (4):
>>    Move statically linked xorgxkb files from dixmods to a separate
>>      directory
>>    meson: Shuffle around subdirs so we build Xorg loadable modules after
>>      Xorg
>>    meson: Use --export-all-symbols when building PE/COFF objects
> 
> 1/3 broke 'make check' because it missed test/Makefile.am. Fixed that
> up and merged these three:
> 
> remote: E: failed to find patch for rev fbdd73fac68383c93f6f5c6a7615860503039999.
> remote: I: patch #163685 updated using rev b34abb3d2da46339d59a0feefd2240790a6a6a0e.
> remote: I: patch #163686 updated using rev 47a7b63f7455eaeacb634fd800e924f2087dacbd.
> remote: I: 2 patch(es) updated to state Accepted.
> To ssh://git.freedesktop.org/git/xorg/xserver
>     5c8fb7d12..47a7b63f7  master -> master
> 
>>    meson: Fix linkage of loadable modules for PE/COFF
> 
> I'll update meson with that PR locally and see if this works. I think
> it could also be made to have the same effect on ELF (if we build Xorg
> as a PIE), which would have the nice side effect of making loadables
> work sanely when built with -z now or using musl libc.

Hmmm... this is all new to me, but I think that '-z now' just needs the 
loadable modules to not be underlinked?

So, I've split this patch into two, the one bit of underlinking I needed 
to fix (since I don't build most modules), and the PE peculiarities 
(dealing with the fact that symbols from the executable are needed at 
link time, rather than load time).

Applying the second one is probably not a good idea as it requires a 
very recent meson.



More information about the xorg-devel mailing list