[PATCH] Link against libdrm

[PATCH] Link against libdrm

[Sven Joachim]

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-Mmb7MZpHnFY@public.gmane.org>
---
 configure.ac    | 1 +
 src/Makefile.am | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index 6f7f870..b54b8cd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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)
diff --git a/src/Makefile.am b/src/Makefile.am
index f54e135..5836ead 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -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 = \
-- 
1.8.3.1

Re: [PATCH] Link against libdrm

[Maarten Lankhorst]

Op 13-06-13 20:41, Sven Joachim schreef:
> 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-Mmb7MZpHnFY@public.gmane.org>
> ---
>  configure.ac    | 1 +
>  src/Makefile.am | 4 ++--
>  2 files changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/configure.ac b/configure.ac
> index 6f7f870..b54b8cd 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -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)
> diff --git a/src/Makefile.am b/src/Makefile.am
> index f54e135..5836ead 100644
> --- a/src/Makefile.am
> +++ b/src/Makefile.am
> @@ -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 = \
Applied, thanks.