| Message ID | 1427815493-27954-1-git-send-email-gustavo@zacarias.com.ar |
|---|---|
| State | Superseded |
| Headers | show |
Dear Gustavo Zacarias, On Tue, 31 Mar 2015 12:24:53 -0300, Gustavo Zacarias wrote: > If the libdrm package is enabled, the system is built with an udev > provider and MESA3D_DRI_DRIVER is disabled this adds a --disable-libdrm > to configure options, but udev still requires libdrm and results in a > build failure since libdrm include paths aren't filled in (missing drm.h > include error). > So add --enable-libdrm for the udev scenario to counteract the previous > --disable-libdrm. > > Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> > --- > package/x11r7/xserver_xorg-server/xserver_xorg-server.mk | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk > index bb5381c..30b7b38 100644 > --- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk > +++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk > @@ -126,7 +126,7 @@ endif > > ifeq ($(BR2_PACKAGE_HAS_UDEV),y) > XSERVER_XORG_SERVER_DEPENDENCIES += udev > -XSERVER_XORG_SERVER_CONF_OPTS += --enable-config-udev > +XSERVER_XORG_SERVER_CONF_OPTS += --enable-config-udev --enable-libdrm Shouldn't this... > # udev kms support depends on libdrm > ifeq ($(BR2_PACKAGE_LIBDRM),y) > XSERVER_XORG_SERVER_DEPENDENCIES += libdrm be in this if condition, to make sure libdrm is indeed available? Thomas
On 03/31/2015 12:47 PM, Thomas Petazzoni wrote: > Shouldn't this... > >> # udev kms support depends on libdrm >> ifeq ($(BR2_PACKAGE_LIBDRM),y) >> XSERVER_XORG_SERVER_DEPENDENCIES += libdrm > > be in this if condition, to make sure libdrm is indeed available? Oh yes, fixing too many things at once ;) I'll send v2. Regards.
diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk index bb5381c..30b7b38 100644 --- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk +++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk @@ -126,7 +126,7 @@ endif ifeq ($(BR2_PACKAGE_HAS_UDEV),y) XSERVER_XORG_SERVER_DEPENDENCIES += udev -XSERVER_XORG_SERVER_CONF_OPTS += --enable-config-udev +XSERVER_XORG_SERVER_CONF_OPTS += --enable-config-udev --enable-libdrm # udev kms support depends on libdrm ifeq ($(BR2_PACKAGE_LIBDRM),y) XSERVER_XORG_SERVER_DEPENDENCIES += libdrm
If the libdrm package is enabled, the system is built with an udev provider and MESA3D_DRI_DRIVER is disabled this adds a --disable-libdrm to configure options, but udev still requires libdrm and results in a build failure since libdrm include paths aren't filled in (missing drm.h include error). So add --enable-libdrm for the udev scenario to counteract the previous --disable-libdrm. Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> --- package/x11r7/xserver_xorg-server/xserver_xorg-server.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)