Ignore:
Timestamp:
2012-04-15T19:06:57+02:00 (5 years ago)
Author:
mirko
Message:

[feeds/xorg/qt4] upgrade Qt version 4.7.0 -> 4.8.1

  • remove libc checks since by now every libc available in OpenWrt has full nptl support
  • add '-fpermissive' to CFLAGS to compile with GCC 4.7.0
  • package qt4-xmlpatterns
  • remove patches which went upstream meanwhile
File:
1 edited

Legend:

Unmodified
Added
Removed
  • feeds/xorg/lib/qt4/Makefile

    r31090 r31292  
    11# 
    2 # Copyright (C) 2008-2012 OpenWrt.org 
     2# Copyright (C) 2008-2010 OpenWrt.org 
    33# 
    44# This is free software, licensed under the GNU General Public License v2. 
     
    1313 
    1414PKG_NAME:=qt4 
    15 PKG_VERSION:=4.7.0 
     15PKG_VERSION:=4.8.1 
    1616PKG_RELEASE:=1 
    17 PKG_MD5SUM:=3a2f25b9b115037277f4fb759194a7a5 
     17PKG_MD5SUM:=7960ba8e18ca31f0c6e4895a312f92ff 
    1818 
    1919PKG_SOURCE:=qt-everywhere-opensource-src-$(PKG_VERSION).tar.gz 
     
    4444-include $(if $(DUMP),,./files/qmake.mk) 
    4545 
    46 # this should be moved to a more generic place later, as other packages are configured different as well depending on available nptl support 
    47 ifeq ($(CONFIG_USE_GLIBC),y) 
    48   NPTL:=y 
    49 endif 
    50 ifeq ($(CONFIG_USE_EGLIBC),y) 
    51   NPTL:=y 
    52 endif 
    53 ifeq ($(CONFIG_UCLIBC_VERSION_0_9_32),y) 
    54   NPTL:=y 
    55 endif 
    56  
    5746define Package/qt4/config 
    5847        source "$(SOURCE)/Config.in" 
     
    119108endef 
    120109 
    121 define Package/qt4-pgsql 
    122   $(call Package/qt4/Default) 
    123   TITLE+=(pgsql) 
    124   DEPENDS+=+libpq 
    125 endef 
    126  
    127110define Package/qt4-openssl 
    128111  $(call Package/qt4/Default) 
     
    161144  $(call Package/qt4/Default) 
    162145  TITLE+=(webkit) 
    163   DEPENDS+=@USE_GLIBC||@USE_EGLIBC||@UCLIBC_VERSION_0_9_32 +libsqlite3 +qt4-phonon +qt4-dbus +qt4-xml +qt4-gui +qt4-network # versions of uclibc prior 0.9.32 do not have nptl support 
     146  DEPENDS+=+libsqlite3 +qt4-phonon +qt4-dbus +qt4-xml +qt4-gui +qt4-network 
    164147endef 
    165148 
     
    167150  $(call Package/qt4/Default) 
    168151  TITLE+=(script) 
    169   DEPENDS+=@USE_GLIBC||@USE_EGLIBC||@UCLIBC_VERSION_0_9_32 # versions of uclibc prior 0.9.32 do not have nptl support 
    170152endef 
    171153 
     
    224206endef 
    225207 
     208define Package/qt4-xmlpatterns 
     209  $(call Package/qt4/Default) 
     210  TITLE+=(xmlpatterns) 
     211endef 
     212 
    226213### 
    227214define Package/qt4-drivers-mouse/Default 
     
    282269TARGET_LDFLAGS+=-Wl,-rpath-link=$(STAGING_DIR)/usr/lib,-rpath-link=$(PKG_BUILD_DIR)/lib 
    283270TARGET_CFLAGS+=-I$(STAGING_DIR)/usr/include/freetype2 -I$(PKG_BUILD_DIR)/include -I$(STAGING_DIR)/usr/include/directfb 
     271TARGET_CFLAGS+=-fpermissive 
    284272 
    285273ifeq ($(CONFIG_QT4_WS_QWS),y) 
     
    344332                        -confirm-license \ 
    345333                        -opensource \ 
     334                        -stl \ 
     335                        $(if $(CONFIG_PACKAGE_qt4-xmlpatterns),-xmlpatterns,-no-xmlpatterns) \ 
     336                        -no-fast \ 
     337                        -no-largefile \ 
     338                        -exceptions \ 
    346339                        -no-mmx \ 
    347340                        -no-3dnow \ 
    348341                        -no-sse \ 
    349342                        -no-sse2 \ 
     343                        -no-sse3 \ 
     344                        -no-ssse3 \ 
     345                        -no-sse4.1 \ 
     346                        -no-sse4.2 \ 
     347                        -no-avx \ 
     348                        -no-neon \ 
     349                        -no-armfpa \ 
    350350                        -system-zlib \ 
    351351                        -system-libtiff \ 
     
    722722endef 
    723723 
     724define Package/qt4-xmlpatterns/install 
     725        $(INSTALL_DIR) \ 
     726                $(1)/usr/lib 
     727 
     728        $(CP) \ 
     729                $(PKG_INSTALL_DIR)/usr/lib/libQtXmlPatterns.so* \ 
     730                $(1)/usr/lib/ 
     731endef 
     732 
    724733# plugins 
    725734#  mouse drivers 
     
    809818$(eval $(call BuildPackage,qt4-declarative)) 
    810819$(eval $(call BuildPackage,qt4-xml)) 
     820$(eval $(call BuildPackage,qt4-xmlpatterns)) 
    811821 
    812822$(eval $(call BuildPackage,qt4-drivers-mouse-tpmousedriver)) 
Note: See TracChangeset for help on using the changeset viewer.