XLibre/xf86-video-nouveau
1
0
Fork 0
mirror of https://github.com/X11Libre/xf86-video-nouveau.git synced 2026-03-24 01:24:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Link against libdrm

Browse Source 
The DDX uses symbols from libdrm but currently does not link against
it, but rather relies on indirect linkage from libdrm_nouveau.  This
could lead to insufficient dependencies in distribution packages, seen
in http://bugs.debian.org/633786.

Signed-off-by: Sven Joachim <svenjoac@gmx.de>
This commit is contained in:
Sven Joachim
2013-06-13 20:41:53 +02:00
committed by Maarten Lankhorst
parent e96ae2b129
commit 779b8d44b5
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
configure.ac
View File

@@ -80,6 +80,7 @@ XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
XORG_DRIVER_CHECK_EXT(DRI2, [dri2proto >= 2.6])
# Checks for pkg-config packages
PKG_CHECK_MODULES(LIBDRM, [libdrm >= 2.4.17])
PKG_CHECK_MODULES(LIBDRM_NOUVEAU, [libdrm_nouveau >= 2.4.25])
AC_SUBST(LIBDRM_NOUVEAU_CFLAGS)
AC_SUBST(LIBDRM_NOUVEAU_LIBS)

4
src/Makefile.am
View File

@@ -23,10 +23,10 @@
# -avoid-version prevents gratuitous .0.0.0 version numbers on the end
# _ladir passes a dummy rpath to libtool so the thing will actually link
# TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc.
AM_CFLAGS = @XORG_CFLAGS@ @LIBUDEV_CFLAGS@ @LIBDRM_NOUVEAU_CFLAGS@
AM_CFLAGS = @XORG_CFLAGS@ @LIBUDEV_CFLAGS@ @LIBDRM_NOUVEAU_CFLAGS@ @LIBDRM_CFLAGS@
nouveau_drv_la_LTLIBRARIES = nouveau_drv.la
nouveau_drv_la_LDFLAGS = -module -avoid-version @LIBDRM_NOUVEAU_LIBS@ \
@LIBUDEV_LIBS@
@LIBUDEV_LIBS@ @LIBDRM_LIBS@
nouveau_drv_ladir = @moduledir@/drivers
nouveau_drv_la_SOURCES = \