On Sat, 2017-01-14 at 15:19 +0500, 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.
While this does make --disabled-xorg fail differently, it does not work for me: tests-tests.o: In function `main': /home/ajax/git/xserver/test/tests.c:12: undefined reference to `fixes_test' /home/ajax/git/xserver/test/tests.c:14: undefined reference to `hashtabletest_test' /home/ajax/git/xserver/test/tests.c:16: undefined reference to `input_test' /home/ajax/git/xserver/test/tests.c:17: undefined reference to `misc_test' /home/ajax/git/xserver/test/tests.c:18: undefined reference to `signal_logging_test' /home/ajax/git/xserver/test/tests.c:19: undefined reference to `touch_test' /home/ajax/git/xserver/test/tests.c:20: undefined reference to `xfree86_test' /home/ajax/git/xserver/test/tests.c:21: undefined reference to `xkb_test' /home/ajax/git/xserver/test/tests.c:22: undefined reference to `xtest_test' /home/ajax/git/xserver/test/tests.c:26: undefined reference to `protocol_xchangedevicecontrol_test' /home/ajax/git/xserver/test/tests.c:28: undefined reference to `protocol_xiqueryversion_test' /home/ajax/git/xserver/test/tests.c:29: undefined reference to `protocol_xiquerydevice_test' /home/ajax/git/xserver/test/tests.c:30: undefined reference to `protocol_xiselectevents_test' /home/ajax/git/xserver/test/tests.c:31: undefined reference to `protocol_xigetselectedevents_test' /home/ajax/git/xserver/test/tests.c:32: undefined reference to `protocol_xisetclientpointer_test' /home/ajax/git/xserver/test/tests.c:33: undefined reference to `protocol_xigetclientpointer_test' /home/ajax/git/xserver/test/tests.c:34: undefined reference to `protocol_xipassivegrabdevice_test' /home/ajax/git/xserver/test/tests.c:35: undefined reference to `protocol_xiquerypointer_test' /home/ajax/git/xserver/test/tests.c:36: undefined reference to `protocol_xiwarppointer_test' /home/ajax/git/xserver/test/tests.c:37: undefined reference to `protocol_eventconvert_test' /home/ajax/git/xserver/test/tests.c:38: undefined reference to `xi2_test' collect2: error: ld returned 1 exit status - ajax _______________________________________________ [email protected]: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: https://lists.x.org/mailman/listinfo/xorg-devel
