bakabtw/packages
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qt4: Do not always compile optional features.

Browse Source 
This adds the packages to PKG_CONFIG_DEPENDS to make sure qt4 is rebuilt if the config changes.


git-svn-id: svn://svn.openwrt.org/openwrt/packages@22706 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
mb 2010-08-18 19:02:38 +00:00
parent 52abffa52f
commit 5ca079f816
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
Xorg/lib/qt4/Makefile
View File

@ -22,7 +22,13 @@ PKG_BUILD_PARALLEL:=1
PKG_CONFIG_DEPENDS:= \ PKG_CONFIG_DEPENDS:= \
CONFIG_PACKAGE_qt4-demos \ CONFIG_PACKAGE_qt4-demos \
CONFIG_PACKAGE_qt4-examples CONFIG_PACKAGE_qt4-examples \
CONFIG_PACKAGE_qt4-svg \
CONFIG_PACKAGE_qt4-qt3support \
CONFIG_PACKAGE_qt4-dbus \
CONFIG_PACKAGE_qt4-phonon \
CONFIG_PACKAGE_qt4-sqlite \
CONFIG_PACKAGE_qt4-mysql
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
@ -53,7 +59,6 @@ endef
define Package/qt4-gui define Package/qt4-gui
$(call Package/qt4/Default) $(call Package/qt4/Default)
#DEPENDS+=+FEATURE_drawing-backend_DirectFB:directfb +libpng +libtiff +libjpeg +libfreetype
DEPENDS+=+libpng +libtiff +libjpeg +libfreetype +qt4-network DEPENDS+=+libpng +libtiff +libjpeg +libfreetype +qt4-network
TITLE+=(gui) TITLE+=(gui)
endef endef
@ -67,7 +72,7 @@ endef
define Package/qt4-examples define Package/qt4-examples
$(call Package/qt4/Default) $(call Package/qt4/Default)
TITLE+=(examples) TITLE+=(examples)
DEPENDS+=+qt4-gui DEPENDS+=+qt4-gui +qt4-svg
endef endef
define Package/qt4-network define Package/qt4-network
@ -111,7 +116,6 @@ endef
define Package/qt4-svg define Package/qt4-svg
$(call Package/qt4/Default) $(call Package/qt4/Default)
TITLE+=(svg) TITLE+=(svg)
#DEPENDS+=+qt4-gui @BROKEN
DEPENDS+=+qt4-gui +qt4-network DEPENDS+=+qt4-gui +qt4-network
endef endef
@ -238,7 +242,6 @@ TARGET_CFLAGS+=-I$(STAGING_DIR)/usr/include/freetype2 -I$(PKG_BUILD_DIR)/include
define Build/Configure define Build/Configure
# NOTES: # NOTES:
# demos/examples: which demos are going to be built depends on which features are going to to be compiled into qt # demos/examples: which demos are going to be built depends on which features are going to to be compiled into qt
# svg: always compile in svg-support, as once qt is built without, strange include errors occur when we're going to compile qt4-svg afterwards
# linuxfb/directfb: since directfb is not much overhead compared to plain framebuffer, force using directfb # linuxfb/directfb: since directfb is not much overhead compared to plain framebuffer, force using directfb
# do not use fontconfig as it doesn't work anyway for qte # do not use fontconfig as it doesn't work anyway for qte
# bindir: bindir is where the host tools (qmake, moc, rcc, uic) will get installed into - they are just used on the host and not goig to be packaged # bindir: bindir is where the host tools (qmake, moc, rcc, uic) will get installed into - they are just used on the host and not goig to be packaged
@ -289,17 +292,17 @@ define Build/Configure
-system-libjpeg \ -system-libjpeg \
-system-freetype \ -system-freetype \
-system-sqlite \ -system-sqlite \
-plugin-sql-sqlite \ $(if $(CONFIG_PACKAGE_qt4-sqlite),-plugin-sql-sqlite) \
-plugin-sql-mysql \ $(if $(CONFIG_PACKAGE_qt4-mysql),-plugin-sql-mysql) \
-no-decoration-styled \ -no-decoration-styled \
-no-decoration-windows \ -no-decoration-windows \
-no-decoration-default \ -no-decoration-default \
-verbose \ -verbose \
-no-multimedia \ -no-multimedia \
-no-audio-backend \ -no-audio-backend \
-phonon \ $(if $(CONFIG_PACKAGE_qt4-phonon),-phonon,-no-phonon) \
-no-phonon-backend \ -no-phonon-backend \
-svg \ $(if $(CONFIG_PACKAGE_qt4-svg),-svg,-no-svg) \
$(if $(NPTL),-webkit,-no-webkit) \ $(if $(NPTL),-webkit,-no-webkit) \
-no-javascript-jit \ -no-javascript-jit \
$(if $(NPTL),-script,-no-script) \ $(if $(NPTL),-script,-no-script) \
@ -310,7 +313,7 @@ define Build/Configure
-no-nis \ -no-nis \
-no-cups \ -no-cups \
-no-iconv \ -no-iconv \
-dbus \ $(if $(CONFIG_PACKAGE_qt4-dbus),-dbus,-no-dbus) \
-no-gtkstyle \ -no-gtkstyle \
-no-nas-sound \ -no-nas-sound \
-no-opengl \ -no-opengl \
@ -328,7 +331,7 @@ define Build/Configure
-no-xinput \ -no-xinput \
-no-xkb \ -no-xkb \
-no-glib \ -no-glib \
-qt3support \ $(if $(CONFIG_PACKAGE_qt4-qt3support),-qt3support,-no-qt3support) \
-no-gfx-transformed \ -no-gfx-transformed \
-no-gfx-qvfb \ -no-gfx-qvfb \
-no-gfx-vnc \ -no-gfx-vnc \