/[gentoo-x86]/x11-base/xorg-server/files/xorg-server-1.11-disable-tests-without-ddx.patch
Gentoo

Contents of /x11-base/xorg-server/files/xorg-server-1.11-disable-tests-without-ddx.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1.1 - (show annotations) (download)
Mon Jan 16 00:43:38 2012 UTC (2 years, 6 months ago) by chithanh
Branch: MAIN
CVS Tags: HEAD
Fix building with USE="minimal -xorg", bug #381771. Add patch to properly cast from pointer to int, bug #399033.

(Portage version: 2.2.0_alpha84/cvs/Linux x86_64)

1 diff -ur a/test/Makefile.am b/test/Makefile.am
2 --- a/test/Makefile.am 2011-07-15 15:26:40.000000000 +0200
3 +++ b/test/Makefile.am 2012-01-02 01:03:15.232740535 +0100
4 @@ -1,21 +1,32 @@
5 if ENABLE_UNIT_TESTS
6 if HAVE_LD_WRAP
7 -SUBDIRS= . xi2
8 -noinst_PROGRAMS = xkb input xtest list misc fixes
9 +SUBDIRS= .
10 +noinst_PROGRAMS = list
11 +if XORG
12 +# Tests that require at least some DDX functions in order to fully link
13 +# For now, requires xf86 ddx, could be adjusted to use another
14 +SUBDIRS += xi2
15 +noinst_PROGRAMS += xkb input xtest misc fixes
16 +endif
17 check_LTLIBRARIES = libxservertest.la
18
19 TESTS=$(noinst_PROGRAMS)
20
21 AM_CFLAGS = $(DIX_CFLAGS) @XORG_CFLAGS@
22 -INCLUDES = $(XORG_INCS) -I$(top_srcdir)/hw/xfree86/parser \
23 - -I$(top_srcdir)/miext/cw -I$(top_srcdir)/hw/xfree86/ddc \
24 +INCLUDES = $(XORG_INCS) -I$(top_srcdir)/miext/cw
25 +if XORG
26 +INCLUDES += -I$(top_srcdir)/hw/xfree86/parser \
27 + -I$(top_srcdir)/hw/xfree86/ddc \
28 -I$(top_srcdir)/hw/xfree86/i2c -I$(top_srcdir)/hw/xfree86/modes \
29 -I$(top_srcdir)/hw/xfree86/ramdac
30 +endif
31 TEST_LDADD=libxservertest.la $(XORG_SYS_LIBS) $(XSERVER_SYS_LIBS)
32
33 +if XORG
34 if SPECIAL_DTRACE_OBJECTS
35 TEST_LDADD += $(OS_LIB) $(DIX_LIB)
36 endif
37 +endif
38
39 xkb_LDADD=$(TEST_LDADD)
40 input_LDADD=$(TEST_LDADD)
41 @@ -24,9 +35,10 @@
42 misc_LDADD=$(TEST_LDADD)
43 fixes_LDADD=$(TEST_LDADD)
44
45 +libxservertest_la_LIBADD = $(XSERVER_LIBS)
46 +if XORG
47 nodist_libxservertest_la_SOURCES = $(top_builddir)/hw/xfree86/sdksyms.c
48 -libxservertest_la_LIBADD = \
49 - $(XSERVER_LIBS) \
50 +libxservertest_la_LIBADD += \
51 $(top_builddir)/hw/xfree86/loader/libloader.la \
52 $(top_builddir)/hw/xfree86/os-support/libxorgos.la \
53 $(top_builddir)/hw/xfree86/common/libcommon.la \
54 @@ -36,7 +48,9 @@
55 $(top_builddir)/hw/xfree86/ramdac/libramdac.la \
56 $(top_builddir)/hw/xfree86/ddc/libddc.la \
57 $(top_builddir)/hw/xfree86/i2c/libi2c.la \
58 - $(top_builddir)/hw/xfree86/dixmods/libxorgxkb.la \
59 + $(top_builddir)/hw/xfree86/dixmods/libxorgxkb.la
60 +endif
61 +libxservertest_la_LIBADD += \
62 $(top_builddir)/mi/libmi.la \
63 $(top_builddir)/os/libos.la \
64 @XORG_LIBS@

  ViewVC Help
Powered by ViewVC 1.1.20