aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Lauer <mickey@vanille-media.de>2006-04-24 10:08:00 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2006-04-24 10:08:00 +0000
commit98300a35c2ca377766a4b4a1fb073d36fadba2da (patch)
tree81687b32746b65c24ad3548abe8c92ce8d74f44f
parent27bf66212cb159b33412e61bfbef787a28290294 (diff)
downloadopenembedded-98300a35c2ca377766a4b4a1fb073d36fadba2da.tar.gz
bitbake files inheriting palmtop: don't override EXTRA_QMAKEVARS_POST, append to it
-rw-r--r--packages/billiardz/billiardz_0.1.4.bb2
-rw-r--r--packages/cumulus/cumulus_1.2.1.bb2
-rw-r--r--packages/cumulus/cumulus_cvs.bb2
-rw-r--r--packages/flexis-zaurus/flexis-zaurus_1.0.0.bb2
-rw-r--r--packages/iaimaster/iaimaster_0.5.bb2
-rw-r--r--packages/justreader/justreader_2.0k.bb2
-rw-r--r--packages/pocketcellar/pocketcellar_1.1.bb2
-rw-r--r--packages/qpdf2/qpdf2_2.2.1.bb2
-rw-r--r--packages/qpegps/qpegps_0.9.2.3.2.bb2
-rw-r--r--packages/qpegps/qpegps_0.9.2.3.bb2
-rw-r--r--packages/sidplayer/sidplayer_1.5.0.bb2
-rw-r--r--packages/ubahnnav/ubahnnav_0.4.1.bb2
-rw-r--r--packages/visiscript/visiscript_0.3.1.bb2
-rw-r--r--packages/visiscript/visiscript_0.3.2.bb2
-rw-r--r--packages/zddice/zddice_1.0.0.bb2
-rw-r--r--packages/zgscore/zgscore_1.0.2.bb2
-rw-r--r--packages/zlapspeed/zlapspeed_1.0.0.bb2
-rw-r--r--packages/zshopi/zshopi_0.2.bb2
18 files changed, 18 insertions, 18 deletions
diff --git a/packages/billiardz/billiardz_0.1.4.bb b/packages/billiardz/billiardz_0.1.4.bb
index e87bab1986..fcba6d2f30 100644
--- a/packages/billiardz/billiardz_0.1.4.bb
+++ b/packages/billiardz/billiardz_0.1.4.bb
@@ -12,7 +12,7 @@ SRC_URI = "http://www.chipx86.com/packages/ipkg/billiardz-${PV}.tar.gz"
inherit palmtop
QMAKE_PROFILES = "billiardz.arm.pro"
-EXTRA_QMAKEVARS_POST = "DEFINES-=FPM_INTEL"
+EXTRA_QMAKEVARS_POST += "DEFINES-=FPM_INTEL"
do_install() {
install -d ${D}${palmtopdir}/bin \
diff --git a/packages/cumulus/cumulus_1.2.1.bb b/packages/cumulus/cumulus_1.2.1.bb
index 18f12203de..1d0d598a6f 100644
--- a/packages/cumulus/cumulus_1.2.1.bb
+++ b/packages/cumulus/cumulus_1.2.1.bb
@@ -14,7 +14,7 @@ S = "${WORKDIR}/cumulus_${PV}/cumulus"
inherit opie
export OE_QMAKE_LINK="${CXX}"
-EXTRA_QMAKEVARS_POST = "INCLUDEPATH+=-I."
+EXTRA_QMAKEVARS_POST += "INCLUDEPATH+=-I."
#
# nasty hack since cumulus doesn't obey the qmake standard which requires just one .pro file per directory
diff --git a/packages/cumulus/cumulus_cvs.bb b/packages/cumulus/cumulus_cvs.bb
index 9fdad829b9..07ef0ccf1a 100644
--- a/packages/cumulus/cumulus_cvs.bb
+++ b/packages/cumulus/cumulus_cvs.bb
@@ -17,7 +17,7 @@ inherit opie
DEFAULT_PREFERENCE = "-1"
export OE_QMAKE_LINK="${CXX}"
-EXTRA_QMAKEVARS_POST = "INCLUDEPATH+=-I."
+EXTRA_QMAKEVARS_POST += "INCLUDEPATH+=-I."
#
# nasty hack since cumulus doesn't obey the qmake standard which requires just one .pro file per directory
diff --git a/packages/flexis-zaurus/flexis-zaurus_1.0.0.bb b/packages/flexis-zaurus/flexis-zaurus_1.0.0.bb
index b3c0119470..eb3784d104 100644
--- a/packages/flexis-zaurus/flexis-zaurus_1.0.0.bb
+++ b/packages/flexis-zaurus/flexis-zaurus_1.0.0.bb
@@ -10,7 +10,7 @@ S = "${WORKDIR}/flexis-zaurus"
inherit palmtop
-EXTRA_QMAKEVARS_POST = "CONFIG-=qtopia"
+EXTRA_QMAKEVARS_POST += "CONFIG-=qtopia"
do_install() {
oe_libinstall libqflexis ${D}${palmtopdir}/plugins/inputmethods/
diff --git a/packages/iaimaster/iaimaster_0.5.bb b/packages/iaimaster/iaimaster_0.5.bb
index d47b81dfba..371b39924a 100644
--- a/packages/iaimaster/iaimaster_0.5.bb
+++ b/packages/iaimaster/iaimaster_0.5.bb
@@ -14,7 +14,7 @@ S = "${WORKDIR}/IaiMaster"
inherit opie
-EXTRA_QMAKEVARS_POST = "TARGET=${PN}"
+EXTRA_QMAKEVARS_POST += "TARGET=${PN}"
do_configure_prepend() {
qmake -project
diff --git a/packages/justreader/justreader_2.0k.bb b/packages/justreader/justreader_2.0k.bb
index 70ee709436..fc08ea6102 100644
--- a/packages/justreader/justreader_2.0k.bb
+++ b/packages/justreader/justreader_2.0k.bb
@@ -13,7 +13,7 @@ S = "${WORKDIR}/TextReader2"
inherit palmtop
-EXTRA_QMAKEVARS_POST = 'INCLUDEPATH+="${STAGING_INCDIR}/qpe" LIBS+=-lqpe'
+EXTRA_QMAKEVARS_POST += 'INCLUDEPATH+="${STAGING_INCDIR}/qpe" LIBS+=-lqpe'
export OE_QMAKE_LINK="${CXX}"
do_configure_prepend() {
diff --git a/packages/pocketcellar/pocketcellar_1.1.bb b/packages/pocketcellar/pocketcellar_1.1.bb
index 4b3ef77042..c7d1815e44 100644
--- a/packages/pocketcellar/pocketcellar_1.1.bb
+++ b/packages/pocketcellar/pocketcellar_1.1.bb
@@ -15,7 +15,7 @@ SRC_URI = "http://www.staikos.net/~staikos/pocketcellar/pocketcellar-${PV}.tar.g
inherit palmtop
-EXTRA_QMAKEVARS_POST = " DESTDIR=pkg-cellar/home/QtPalmtop/bin/"
+EXTRA_QMAKEVARS_POST += " DESTDIR=pkg-cellar/home/QtPalmtop/bin/"
do_install() {
install -d ${D}${palmtopdir}/bin \
diff --git a/packages/qpdf2/qpdf2_2.2.1.bb b/packages/qpdf2/qpdf2_2.2.1.bb
index 6e31f40bd6..c1da64f3f9 100644
--- a/packages/qpdf2/qpdf2_2.2.1.bb
+++ b/packages/qpdf2/qpdf2_2.2.1.bb
@@ -19,7 +19,7 @@ S = "${WORKDIR}/qpdf2_${PV}"
inherit opie
QMAKE_PROFILES = "qpdf_render-freetype.pro"
-EXTRA_QMAKEVARS_POST = "TARGET=qpdf"
+EXTRA_QMAKEVARS_POST += "TARGET=qpdf"
export OE_QMAKE_LINK="${CXX}"
do_configure_prepend() {
diff --git a/packages/qpegps/qpegps_0.9.2.3.2.bb b/packages/qpegps/qpegps_0.9.2.3.2.bb
index 1885f97855..073b95a96a 100644
--- a/packages/qpegps/qpegps_0.9.2.3.2.bb
+++ b/packages/qpegps/qpegps_0.9.2.3.2.bb
@@ -15,7 +15,7 @@ S = "${WORKDIR}/qpegps_my"
inherit palmtop
QMAKE_PROFILES = "qpegps.pro"
-EXTRA_QMAKEVARS_POST = "LIBS=-lqpe"
+EXTRA_QMAKEVARS_POST += "LIBS=-lqpe"
do_install() {
install -d ${D}${palmtopdir}/bin \
diff --git a/packages/qpegps/qpegps_0.9.2.3.bb b/packages/qpegps/qpegps_0.9.2.3.bb
index baa174246f..0b4e5e3ccd 100644
--- a/packages/qpegps/qpegps_0.9.2.3.bb
+++ b/packages/qpegps/qpegps_0.9.2.3.bb
@@ -15,7 +15,7 @@ S = "${WORKDIR}/root/qpegps_src_my/qpegps_my"
inherit palmtop
QMAKE_PROFILES = "qpegps.pro"
-EXTRA_QMAKEVARS_POST = "LIBS=-lqpe"
+EXTRA_QMAKEVARS_POST += "LIBS=-lqpe"
do_install() {
install -d ${D}${palmtopdir}/bin \
diff --git a/packages/sidplayer/sidplayer_1.5.0.bb b/packages/sidplayer/sidplayer_1.5.0.bb
index 1ee1821539..5b2172269d 100644
--- a/packages/sidplayer/sidplayer_1.5.0.bb
+++ b/packages/sidplayer/sidplayer_1.5.0.bb
@@ -13,7 +13,7 @@ SRC_URI = "http://sidplayer.sourceforge.net/sidplayer.tar.gz \
file://gcc34.patch;patch=1"
S = "${WORKDIR}/sidplayer"
-EXTRA_QMAKEVARS_PRE = "QMAKE_INCDIR=${STAGING_INCDIR}/sidplay"
+EXTRA_QMAKEVARS_POST += "INCLUDEPATH+=${STAGING_INCDIR}/sidplay"
inherit palmtop
diff --git a/packages/ubahnnav/ubahnnav_0.4.1.bb b/packages/ubahnnav/ubahnnav_0.4.1.bb
index 16924681db..9d6f85889e 100644
--- a/packages/ubahnnav/ubahnnav_0.4.1.bb
+++ b/packages/ubahnnav/ubahnnav_0.4.1.bb
@@ -19,7 +19,7 @@ S = "${WORKDIR}/ubahnnav-${PV}"
inherit opie
export OE_QMAKE_LINK="${CXX}"
-EXTRA_QMAKEVARS_POST = "INCLUDEPATH+=${S}/src/libsubwaymap LIBS+=-L${S} LIBS-=-lqtopia"
+EXTRA_QMAKEVARS_POST += "INCLUDEPATH+=${S}/src/libsubwaymap LIBS+=-L${S} LIBS-=-lqtopia"
do_configure_prepend() {
find . -name "Makefile"|xargs rm -f
diff --git a/packages/visiscript/visiscript_0.3.1.bb b/packages/visiscript/visiscript_0.3.1.bb
index 948924d597..4124048ea9 100644
--- a/packages/visiscript/visiscript_0.3.1.bb
+++ b/packages/visiscript/visiscript_0.3.1.bb
@@ -17,7 +17,7 @@ inherit opie
QMAKE_PROFILES = "zvisiscript.pro"
-EXTRA_QMAKEVARS_POST = "CONFIG-=thread LIBS-=../qscintilla-1.60-gpl-1.3/qt/libqscintilla.a LIBS+=-lqscintilla"
+EXTRA_QMAKEVARS_POST += "CONFIG-=thread LIBS-=../qscintilla-1.60-gpl-1.3/qt/libqscintilla.a LIBS+=-lqscintilla"
do_install() {
install -d ${D}${palmtopdir}/pics/
diff --git a/packages/visiscript/visiscript_0.3.2.bb b/packages/visiscript/visiscript_0.3.2.bb
index 23a62cee68..7fcdb1bdd1 100644
--- a/packages/visiscript/visiscript_0.3.2.bb
+++ b/packages/visiscript/visiscript_0.3.2.bb
@@ -17,7 +17,7 @@ inherit opie
QMAKE_PROFILES = "zvisiscript.pro"
-EXTRA_QMAKEVARS_POST = "CONFIG-=thread LIBS-=../qscintilla-1.60-gpl-1.3/qt/lib/libqscintilla_arm.a LIBS+=-lqscintilla"
+EXTRA_QMAKEVARS_POST += "CONFIG-=thread LIBS-=../qscintilla-1.60-gpl-1.3/qt/lib/libqscintilla_arm.a LIBS+=-lqscintilla"
export OE_QMAKE_LINK="${CXX}"
do_compile_prepend() {
diff --git a/packages/zddice/zddice_1.0.0.bb b/packages/zddice/zddice_1.0.0.bb
index f10589c80b..2a58a0a332 100644
--- a/packages/zddice/zddice_1.0.0.bb
+++ b/packages/zddice/zddice_1.0.0.bb
@@ -11,7 +11,7 @@ S = "${WORKDIR}/zddice-src"
inherit palmtop
-EXTRA_QMAKEVARS_POST = 'TMAKE_LIBS-="-luuid" TMAKE_LIBS+="-lqpe" CONFIG+=qt CONFIG-=qtopia'
+EXTRA_QMAKEVARS_POST += 'TMAKE_LIBS-="-luuid" TMAKE_LIBS+="-lqpe" CONFIG+=qt CONFIG-=qtopia'
do_install() {
install -d ${D}${palmtopdir}/{bin,pics,apps/Games}
diff --git a/packages/zgscore/zgscore_1.0.2.bb b/packages/zgscore/zgscore_1.0.2.bb
index e3dc83117c..262902ce2f 100644
--- a/packages/zgscore/zgscore_1.0.2.bb
+++ b/packages/zgscore/zgscore_1.0.2.bb
@@ -12,7 +12,7 @@ S = "${WORKDIR}/zgscore-src"
inherit palmtop
-EXTRA_QMAKEVARS_POST = 'TMAKE_LIBS-="-luuid" TMAKE_LIBS+="-lqpe" CONFIG+=qt CONFIG-=qtopia'
+EXTRA_QMAKEVARS_POST += 'TMAKE_LIBS-="-luuid" TMAKE_LIBS+="-lqpe" CONFIG+=qt CONFIG-=qtopia'
do_install() {
install -d ${D}${palmtopdir}/bin \
diff --git a/packages/zlapspeed/zlapspeed_1.0.0.bb b/packages/zlapspeed/zlapspeed_1.0.0.bb
index ee0718a02c..cb4b5e5d83 100644
--- a/packages/zlapspeed/zlapspeed_1.0.0.bb
+++ b/packages/zlapspeed/zlapspeed_1.0.0.bb
@@ -10,7 +10,7 @@ S = "${WORKDIR}/zlaps-src"
inherit palmtop
-EXTRA_QMAKEVARS_POST = 'TMAKE_LIBS-="-luuid" TMAKE_LIBS+="-lqpe" CONFIG+=qt CONFIG-=qtopia'
+EXTRA_QMAKEVARS_POST += 'TMAKE_LIBS-="-luuid" TMAKE_LIBS+="-lqpe" CONFIG+=qt CONFIG-=qtopia'
do_install() {
install -d ${D}${palmtopdir}/{bin,pics,apps/Applications}
diff --git a/packages/zshopi/zshopi_0.2.bb b/packages/zshopi/zshopi_0.2.bb
index b393122113..db49069934 100644
--- a/packages/zshopi/zshopi_0.2.bb
+++ b/packages/zshopi/zshopi_0.2.bb
@@ -23,7 +23,7 @@ FILES_zshopi-i18n-de = "/opt/QtPalmtop/i18n/*"
inherit opie
-EXTRA_QMAKEVARS_POST = "DEFINES+=QTOPIA LIBS+=-lm LIBS+=-lsqlite LIBS+=-lqpe"
+EXTRA_QMAKEVARS_POST += "DEFINES+=QTOPIA LIBS+=-lm LIBS+=-lsqlite LIBS+=-lqpe"
OE_QMAKE_CXXFLAGS = "-fno-rtti ${CXXFLAGS}"
do_configure_prepend() {