Since commit 3ef16dfb9830bd6b41ae428f4f213ae0c35c1056, "dmx: fix
linking", linking dmx is broken for me:
CCLD Xdmx.exe
../../render/.libs/librender.a(glyph.o): In function `HashGlyph':
/wip/xserver/build.x86_64/../render/glyph.c:168: undefined reference to
`x_sha1_init'
/wip/xserver/build.x86_64/../render/glyph.c:174: undefined reference to
`x_sha1_update'
/wip/xserver/build.x86_64/../render/glyph.c:177: undefined reference to
`x_sha1_update'
/wip/xserver/build.x86_64/../render/glyph.c:180: undefined reference to
`x_sha1_final'
../../render/.libs/librender.a(mipict.o): In function `miClipPictureReg':
/wip/xserver/build.x86_64/../render/mipict.c:233: undefined reference to
`pixman_region_n_rects'
/wip/xserver/build.x86_64/../render/mipict.c:234: undefined reference to
`pixman_region_n_rects'
/wip/xserver/build.x86_64/../render/mipict.c:235: undefined reference to
`pixman_region_rectangles'
/wip/xserver/build.x86_64/../render/mipict.c:236: undefined reference to
`pixman_region_rectangles'
/wip/xserver/build.x86_64/../render/mipict.c:248: undefined reference to
`pixman_region_init'
/wip/xserver/build.x86_64/../render/mipict.c:251: undefined reference to
`pixman_region_not_empty'
/wip/xserver/build.x86_64/../render/mipict.c:261: undefined reference to
`pixman_region_not_empty'
../../render/.libs/librender.a(mipict.o): In function
`miComputeCompositeRegion':
/wip/xserver/build.x86_64/../render/mipict.c:340: undefined reference to
`pixman_region_init'
The change this was fixing appears to be effectively reverted by
542d9f6807ac06b70f564ccab10af69fa21a1221, so just revert commit
3ef16dfb9830bd6b41ae428f4f213ae0c35c1056.
Signed-off-by: Jon Turney <jon.tur...@dronecode.org.uk>
---
hw/dmx/Makefile.am | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/hw/dmx/Makefile.am b/hw/dmx/Makefile.am
index 38d6ac409..eef84cb66 100644
--- a/hw/dmx/Makefile.am
+++ b/hw/dmx/Makefile.am
@@ -80,8 +80,7 @@ XDMX_LIBS = \
Xdmx_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG)
Xdmx_DEPENDENCIES= $(XDMX_LIBS)
-Xdmx_LDADD = $(XDMX_LIBS) $(XDMX_SYS_LIBS) $(XSERVER_SYS_LIBS) \
- $(top_builddir)/render/librender.la
+Xdmx_LDADD = $(XDMX_LIBS) $(XDMX_SYS_LIBS) $(XSERVER_SYS_LIBS)
relink:
$(AM_V_at)rm -f Xdmx$(EXEEXT) && $(MAKE) Xdmx$(EXEEXT)
--
2.14.1
_______________________________________________
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: https://lists.x.org/mailman/listinfo/xorg-devel
