package/x11r7/xserver_xorg-server: fix xlib_libXfont2 dependency
PATCH 1/1 package/x11r7/xserver_xorg-server: fix xlib_libXfont2 dependency
The dependency to xlib_libXfont2 was mistakenly removed in
https://git.buildroot.net/buildroot/commit/?id=e6dc4f1857eed27a19abd57fae7428bea38b69e5
Add it back again to fix build errors detected by the autobuilders and remove handling of xlib_libXfont as well because only older versions of xserver_xorg-server needed it.
Fixes:
http://autobuild.buildroot.net/results/f72/f72cc9b30e55e2c665de7a00482a1c3ba702118c/
http://autobuild.buildroot.net/results/9dd/9dd99e633dee8f11e7b2b973d4a72e51a2812ec9/
--- package/x11r7/xserver_xorg-server/Config.in | 1 + package/x11r7/xserver_xorg-server/xserver_xorg-server.mk | 9 +-------- 2 files changed, 2 insertions(+), 8 deletions(-)
package/x11r7/xserver_xorg-server/Config.in +1 -0
@@ -22,6 +22,7 @@ config BR2_PACKAGE_XSERVER_XORG_SERVER select BR2_PACKAGE_XLIB_LIBXDMCP select BR2_PACKAGE_XLIB_LIBXEXT select BR2_PACKAGE_XLIB_LIBXFIXES + select BR2_PACKAGE_XLIB_LIBXFONT2 select BR2_PACKAGE_XLIB_LIBXFT select BR2_PACKAGE_XLIB_LIBXI select BR2_PACKAGE_XLIB_LIBXINERAMA
package/x11r7/xserver_xorg-server/xserver_xorg-server.mk +1 -8
@@ -20,6 +20,7 @@ XSERVER_XORG_SERVER_DEPENDENCIES = \ xlib_libXdmcp \ xlib_libXext \ xlib_libXfixes \ + xlib_libXfont2 \ xlib_libXi \ xlib_libXrender \ xlib_libXres \
@@ -160,14 +161,6 @@ else XSERVER_XORG_SERVER_CONF_OPTS += --disable-libunwind endif -ifeq ($(BR2_PACKAGE_XLIB_LIBXFONT2),y) -XSERVER_XORG_SERVER_DEPENDENCIES += xlib_libXfont2 -endif - -ifeq ($(BR2_PACKAGE_XLIB_LIBXFONT),y) -XSERVER_XORG_SERVER_DEPENDENCIES += xlib_libXfont -endif - ifneq ($(BR2_PACKAGE_XLIB_LIBXVMC),y) XSERVER_XORG_SERVER_CONF_OPTS += --disable-xvmc endif
Signature · 1 line
2.27.0
Thomas Petazzoni
AppliedPATCH 1/1 package/x11r7/xserver_xorg-server: fix xlib_libXfont2 dependency
Quoted 11 lines · On Sat, 5 Sep 2020 16:53:23 +0200 Bernd Kuhls <[email protected]> wrote:
The dependency to
xlib_libXfont2was mistakenly removed in
https://git.buildroot.net/buildroot/commit/?id=e6dc4f1857eed27a19abd57fae7428bea38b69e5Add it back again to fix build errors detected by the autobuilders and remove handling of
xlib_libXfontas well because only older versions of xserver_xorg-server needed it.Fixes:
http://autobuild.buildroot.net/results/f72/f72cc9b30e55e2c665de7a00482a1c3ba702118c/
http://autobuild.buildroot.net/results/9dd/9dd99e633dee8f11e7b2b973d4a72e51a2812ec9/
Quoted 5 lines
Signed-off-by Bernd Kuhls <[email protected]>--- package/x11r7/xserver_xorg-server/Config.in | 1 + package/x11r7/xserver_xorg-server/xserver_xorg-server.mk | 9 +-------- 2 files changed, 2 insertions(+), 8 deletions(-)
Applied to master, thanks. It is very, very good that the commit log contains the details of since when the issue is occurring, and why. Thanks for that!
Best regards,
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com