Remove locale dependency from xserver
PATCH 1/2 Remove locale dependency from xserver
XServer compiles just fine without locale support
Signed-off-by Paulius Zaleckas <[email protected]>
---
package/x11r7/Config.in | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-)
package/x11r7/Config.in +3 -4
@@ -19,11 +19,10 @@ choice config BR2_PACKAGE_XSERVER_xorg bool "Modular X.org" - # depending on BR2_ENABLE_LOCALE gives a recursion error with dbus - depends on BR2_LARGEFILE && BR2_INSTALL_LIBSTDCPP # && BR2_ENABLE_LOCALE + depends on BR2_LARGEFILE && BR2_INSTALL_LIBSTDCPP -comment 'X.org requires largefile, locale and C++ support' - depends on !(BR2_LARGEFILE && BR2_INSTALL_LIBSTDCPP && BR2_ENABLE_LOCALE) +comment 'X.org requires largefile and C++ support' + depends on !(BR2_LARGEFILE && BR2_INSTALL_LIBSTDCPP) config BR2_PACKAGE_XSERVER_tinyx bool "TinyX"
PATCH 2/2 Use only $(MAKE1) when installing Xserver
Xserver installation fails with parallel make jobs.
Installation to staging is not needed. So jus remove it instead of converting to $(MAKE1).
Signed-off-by Paulius Zaleckas <[email protected]>
---
.../xserver_xorg-server/xserver_xorg-server.mk | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-)
package/x11r7/xserver_xorg-server/xserver_xorg-server.mk +3 -1
@@ -9,7 +9,6 @@ XSERVER_XORG_SERVER_SOURCE = xorg-server-$(XSERVER_XORG_SERVER_VERSION).tar.bz2 XSERVER_XORG_SERVER_SITE = http://xorg.freedesktop.org/releases/individual/xserver XSERVER_XORG_SERVER_AUTORECONF = NO XSERVER_XORG_SERVER_LIBTOOL_PATCH = NO -XSERVER_XORG_SERVER_INSTALL_STAGING = YES XSERVER_XORG_SERVER_USE_CONFIG_CACHE = NO # overrides CFLAGS XSERVER_XORG_SERVER_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) install install-data
@@ -137,5 +136,8 @@ ifneq ($(BR2_PACKAGE_XLIB_LIBDMX),y) XSERVER_XORG_SERVER_CONF_OPT += --disable-dmx endif +define XSERVER_XORG_SERVER_INSTALL_TARGET_CMDS + $(MAKE1) $(XSERVER_XORG_SERVER_INSTALL_TARGET_OPT) -C $(@D) +endef $(eval $(call AUTOTARGETS,package/x11r7,xserver_xorg-server))
PATCH 1/2 Remove locale dependency from xserver
In reply to Paulius ZaleckasQuoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Paulius" == Paulius Zaleckas <[email protected]> writes:
Paulius> XServer compiles just fine without locale support Paulius> Signed-off-by: Paulius Zaleckas <[email protected]>
Committed both, thanks!
Signature · 1 line
Bye, Peter Korsgaard