[Buildroot] [PATCH 1/2] Remove locale dependency from xserver

[Buildroot] [PATCH 1/2] Remove locale dependency from xserver

[Paulius Zaleckas]

XServer compiles just fine without locale support

Signed-off-by: Paulius Zaleckas <paulius.zaleckas@gmail.com>
---

 package/x11r7/Config.in |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/package/x11r7/Config.in b/package/x11r7/Config.in
index 55524a0..b93cc90 100644
--- a/package/x11r7/Config.in
+++ b/package/x11r7/Config.in
@@ -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"

[Buildroot] [PATCH 2/2] Use only $(MAKE1) when installing Xserver

[Paulius Zaleckas]

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 <paulius.zaleckas@gmail.com>
---

 .../xserver_xorg-server/xserver_xorg-server.mk     |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
index 6c6017b..a49c180 100644
--- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
+++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
@@ -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))

[Buildroot] [PATCH 1/2] Remove locale dependency from xserver

[Peter Korsgaard]

>>>>> "Paulius" == Paulius Zaleckas <paulius.zaleckas@gmail.com> writes:

 Paulius> XServer compiles just fine without locale support
 Paulius> Signed-off-by: Paulius Zaleckas <paulius.zaleckas@gmail.com>

Committed both, thanks!

-- 
Bye, Peter Korsgaard