qt4: do not compile parts which require nptl support when no nptl support is availabl...

SVN-Revision: 22300

diff --git a/Xorg/lib/qt4/Makefile b/Xorg/lib/qt4/Makefile
index 8908a6d2c17594b9cb159cff245d15ce96f8b50d..314ae68c33ac9cec64bd0adbdafc0f4a8667bf36 100644 (file)
--- 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
 
 
 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
 define Package/qt4/Default
   SECTION:=xorg-framework
   CATEGORY:=Xorg


@@ -230,8 +241,8 @@ define Build/Configure
                        -no-rpath \
                        -force-pkg-config \
                        -nomake tools \
                        -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 \
                        -nomake docs \
                        -nomake translations \
                        -embedded openwrt \


@@ -259,12 +270,12 @@ define Build/Configure
                        -phonon \
                        -no-phonon-backend \
                        -svg \
                        -phonon \
                        -no-phonon-backend \
                        -svg \

-                       -webkit \
+                       -$(if $(NPTL),webkit,-no-webkit) \

                        -no-javascript-jit \
                        -no-javascript-jit \

-                       -script \
-                       -scripttools \
+                       -$(if $(NPTL),script,-no-script) \
+                       -$(if $(NPTL),scripttools,-no-scripttools) \

                        -no-accessibility \
                        -no-accessibility \

-                       -declarative \
+                       -$(if $(NPTL),declarative,-no-declarative) \

                        -no-openssl \
                        -no-nis \
                        -no-cups \
                        -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) \
        # 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
 endef
 
 define Build/InstallDev