[PATCH xserver] meson: Ensure we always build Xext/hashtable.c for glx

Adam Jackson ajax at nwnk.net
Thu Apr 19 20:32:08 UTC 2018


On Wed, 2018-04-18 at 18:09 -0400, Lyude Paul wrote:
> Seems that while glxvnd relies on some of the hashtable functions in
> Xext, we only build hashtable support for Xext if we're also building
> the res extension. This leads to some errors if you try to build glx
> without res enabled:
> 
> glx/liblibglxvnd.a(vndcmds.c.o): In function `LookupVendorPrivDispatch':
> /home/lyudess/Projects/xserver/glx/vndcmds.c:65: undefined reference to `ht_find'
> /home/lyudess/Projects/xserver/glx/vndcmds.c:67: undefined reference to `ht_add'
> glx/liblibglxvnd.a(vndcmds.c.o): In function `GlxDispatchInit':
> /home/lyudess/Projects/xserver/glx/vndcmds.c:405: undefined reference to `ht_generic_compare'
> /home/lyudess/Projects/xserver/glx/vndcmds.c:405: undefined reference to `ht_generic_hash'
> /home/lyudess/Projects/xserver/glx/vndcmds.c:405: undefined reference to `ht_create'
> glx/liblibglxvnd.a(vndcmds.c.o): In function `GlxDispatchReset':
> /home/lyudess/Projects/xserver/glx/vndcmds.c:468: undefined reference to `ht_destroy'
> collect2: error: ld returned 1 exit status
> ninja: build stopped: subcommand failed.
> 
> So, make sure that hashtable.c gets both for both glx and res
> 
> Signed-off-by: Lyude Paul <lyude at redhat.com>

Merged these two, thanks:

remote: I: patch #217776 updated using rev 4e28a6a223c4f9d0f5defe0313a94e22e0416787.
remote: I: patch #217775 updated using rev fe4d1876b4f01c0b0e1916d548c398789f196164.
remote: I: 2 patch(es) updated to state Accepted.
To ssh://git.freedesktop.org/git/xorg/xserver
   3b4671f9e9..fe4d1876b4  master -> master

- ajax


More information about the xorg-devel mailing list