From: mirko <mirko@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Tue, 20 Jul 2010 00:27:39 +0000 (+0000)
Subject: qt4: do not compile parts which require nptl support when no nptl support is availabl... 
X-Git-Url: http://207.154.207.93/?a=commitdiff_plain;h=db2027dd5e3b71cd359a633cc37f842a5a8c9b46;p=packages.git

qt4: do not compile parts which require nptl support when no nptl support is available (as uClibc < 0.9.32)

git-svn-id: svn://svn.openwrt.org/openwrt/packages@22300 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

diff --git a/Xorg/lib/qt4/Makefile b/Xorg/lib/qt4/Makefile
index 8908a6d2c..314ae68c3 100644
--- a/Xorg/lib/qt4/Makefile
+++ b/Xorg/lib/qt4/Makefile
@@ -23,6 +23,17 @@ PKG_BUILD_DIR=$(BUILD_DIR)/qt-everywhere-opensource-src-$(PKG_VERSION)
 
 include $(INCLUDE_DIR)/package.mk
 
+# this should be moved to a more generic place later, as other packages are configured different as well depending on available nptl support
+ifeq ($(CONFIG_USE_GLIBC),y)
+  NPTL:=y
+endif
+ifeq ($(CONFIG_USE_EGLIBC),y)
+  NPTL:=y
+endif
+ifeq ($(CONFIG_UCLIBC_VERSION_0_9_32),y)
+  NPTL:=y
+endif
+
 define Package/qt4/Default
   SECTION:=xorg-framework
   CATEGORY:=Xorg
@@ -230,8 +241,8 @@ define Build/Configure
 			-no-rpath \
 			-force-pkg-config \
 			-nomake tools \
-			-$(if $(CONFIG_PACKAGE_qt4-demos),make demos,nomake demos) \
-			-$(if $(CONFIG_PACKAGE_qt4-examples),make examples,nomake examples) \
+			-make demos \
+			-make examples \
 			-nomake docs \
 			-nomake translations \
 			-embedded openwrt \
@@ -259,12 +270,12 @@ define Build/Configure
 			-phonon \
 			-no-phonon-backend \
 			-svg \
-			-webkit \
+			-$(if $(NPTL),webkit,-no-webkit) \
 			-no-javascript-jit \
-			-script \
-			-scripttools \
+			-$(if $(NPTL),script,-no-script) \
+			-$(if $(NPTL),scripttools,-no-scripttools) \
 			-no-accessibility \
-			-declarative \
+			-$(if $(NPTL),declarative,-no-declarative) \
 			-no-openssl \
 			-no-nis \
 			-no-cups \
@@ -298,7 +309,7 @@ define Build/Compile
 	# just passing <make install> results in not building 3rdparty/webkit/JavaScriptCore
 	$(MAKE) -C $(PKG_BUILD_DIR)
 	INSTALL_ROOT=$(PKG_INSTALL_DIR) \
-		$(MAKE) -j5 -C $(PKG_BUILD_DIR) install
+		$(MAKE) -C $(PKG_BUILD_DIR) install
 endef
 
 define Build/InstallDev