ddx: fix xf86Config.a generation
We were generating a shared library, but this lib is foobar, the parser requires some symbols from the X server or from the program its being linked into. If the program its being linked into (say a python .so) has symbol visibility enabled then it will fail to dynamic link, also if this .so has symbol visiblity enabled it will fail to dynamic link. Screw it go back to a .a file really unless someone cleans it up properly. Signed-off-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
parent
3047bd0674
commit
5fb188b547
|
@ -53,7 +53,7 @@ libxorg_la_LIBADD = \
|
|||
loader/libloader.la \
|
||||
os-support/libxorgos.la \
|
||||
common/libcommon.la \
|
||||
parser/libxf86config.la \
|
||||
parser/libxf86config_internal.la \
|
||||
dixmods/libdixmods.la \
|
||||
modes/libxf86modes.la \
|
||||
ramdac/libramdac.la \
|
||||
|
|
|
@ -1,13 +1,14 @@
|
|||
if INSTALL_LIBXF86CONFIG
|
||||
lib_LTLIBRARIES = libxf86config.la
|
||||
lib_LTLIBRARIES = libxf86config_internal.la
|
||||
lib_LIBRARIES = libxf86config.a
|
||||
LIBHEADERS = \
|
||||
xf86Optrec.h \
|
||||
xf86Parser.h
|
||||
else
|
||||
noinst_LTLIBRARIES = libxf86config.la
|
||||
noinst_LTLIBRARIES = libxf86config_internal.la
|
||||
endif
|
||||
|
||||
libxf86config_la_SOURCES = \
|
||||
INTERNAL_SOURCES= \
|
||||
Device.c \
|
||||
Files.c \
|
||||
Flags.c \
|
||||
|
@ -25,6 +26,13 @@ libxf86config_la_SOURCES = \
|
|||
DRI.c \
|
||||
Extensions.c
|
||||
|
||||
libxf86config_internal_la_SOURCES = \
|
||||
$(INTERNAL_SOURCES)
|
||||
|
||||
libxf86config_a_SOURCES = \
|
||||
$(INTERNAL_SOURCES)
|
||||
libxf86config_a_CFLAGS = $(AM_CFLAGS)
|
||||
|
||||
AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS)
|
||||
|
||||
EXTRA_DIST = \
|
||||
|
|
Loading…
Reference in New Issue
Block a user