diff options
| author | Michael Lauer <mickey@vanille-media.de> | 2006-04-22 23:15:27 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-04-22 23:15:27 +0000 |
| commit | 207f2981251c3a1ce5a5beb0ccae858111998662 (patch) | |
| tree | 742ddb5f303f45c65b9643be61451a0fd06f31cf | |
| parent | 6fafa3e31879a6ee0cd590c912391cbb1f39bf48 (diff) | |
libqpe/libopie: don't override EXTRA_QMAKEVARS_POST|PRE given in class
| -rw-r--r-- | classes/opie.bbclass | 2 | ||||
| -rw-r--r-- | classes/palmtop.bbclass | 4 | ||||
| -rw-r--r-- | packages/libopie/libopie2.inc | 4 | ||||
| -rw-r--r-- | packages/libqpe/libqpe-opie.inc | 9 |
4 files changed, 9 insertions, 10 deletions
diff --git a/classes/opie.bbclass b/classes/opie.bbclass index c00f7e19a9..d0433d5035 100644 --- a/classes/opie.bbclass +++ b/classes/opie.bbclass @@ -23,7 +23,7 @@ OPIE_CVS_PV = "1.2.1+cvs-${SRCDATE}" DEPENDS_prepend = "${@["libopie2 ", ""][(bb.data.getVar('PN', d, 1) == 'libopie2')]}" # to be consistent, put all targets into workdir -EXTRA_QMAKEVARS_POST_append = " DESTDIR=${S}" +EXTRA_QMAKEVARS_POST += "DESTDIR=${S}" # Opie standard TAG value TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}" diff --git a/classes/palmtop.bbclass b/classes/palmtop.bbclass index e54d9e8587..083f5148a1 100644 --- a/classes/palmtop.bbclass +++ b/classes/palmtop.bbclass @@ -9,8 +9,8 @@ inherit qmake EXTRA_QMAKEVARS_POST += "DEFINES+=QWS LIBS+=-lqpe CONFIG+=qt LIBS-=-lstdc++ LIBS+=-lsupc++" -EXTRA_QMAKEVARS_POST += '${@base_conditional("PALMTOP_USE_MULTITHREADED_QT", "yes", "CONFIG+=thread", "",d)}' +EXTRA_QMAKEVARS_POST += '${@base_conditional("PALMTOP_USE_MULTITHREADED_QT", "yes", "CONFIG+=thread", " ",d)}' -DEPENDS_prepend = "virtual/libqpe1 uicmoc-native " +DEPENDS_prepend = "${@["virtual/libqpe1 uicmoc-native ", ""][(bb.data.getVar('PN', d, 1) == 'libqpe-opie')]}" FILES_${PN} = "${palmtopdir}" diff --git a/packages/libopie/libopie2.inc b/packages/libopie/libopie2.inc index 4a05010dea..390de9c9ad 100644 --- a/packages/libopie/libopie2.inc +++ b/packages/libopie/libopie2.inc @@ -15,13 +15,13 @@ PARALLEL_MAKE = "" #FIXME: Add machine specific bits here. Best use oe_machinstall and read from a given file -EXTRA_QMAKEVARS_POST = 'DEFINES+=OPIE_NEW_MALLOC \ +EXTRA_QMAKEVARS_POST += 'DEFINES+=OPIE_NEW_MALLOC \ DEFINES+="OPIE_SOUND_FRAGMENT_SHIFT=16" \ DEFINES+=OPIE_NO_ERASE_RECT_HACKFIX \ LIBS+=-L${S} LIBS+="-Wl,-rpath-link,${S}"' #NOTE: We no longer enable the sqlite PIM backend here, since a) using it means no sync and b) it's too large for 16MB images -EXTRA_QMAKEVARS_PRE = 'ENABLE_SQL_PIM_BACKEND=n' +EXTRA_QMAKEVARS_PRE += 'ENABLE_SQL_PIM_BACKEND=n' MODULES = "opiecore opiedb opiemm opienet opiepim opiesecurity opieui opiebluez" LIBS = "core2 db2 mm2 net2 pim2 security2 ui2 bluez2" diff --git a/packages/libqpe/libqpe-opie.inc b/packages/libqpe/libqpe-opie.inc index 9de6f4a0e8..57759a1681 100644 --- a/packages/libqpe/libqpe-opie.inc +++ b/packages/libqpe/libqpe-opie.inc @@ -10,14 +10,13 @@ PROVIDES = "virtual/libqpe1" S = "${WORKDIR}/library" -inherit qmake +inherit palmtop QMAKE_PROFILES = "library.pro" -EXTRA_QMAKEVARS_PRE = "CONFIG+=LIBQPE_WITHROHFEEDBACK" -EXTRA_QMAKEVARS_PRE += '${@base_conditional("PALMTOP_USE_MULTITHREADED_QT", "yes", "CONFIG+=thread", "",d)}' -EXTRA_QMAKEVARS_POST = "DESTDIR= DEFINES+=LIBQPE_NO_INLINE_IMAGES" +EXTRA_QMAKEVARS_PRE += "CONFIG+=LIBQPE_WITHROHFEEDBACK" +EXTRA_QMAKEVARS_POST += "DESTDIR= DEFINES+=LIBQPE_NO_INLINE_IMAGES" -CXXFLAGS_append = " -DQWS -DOPIE_NO_ERASE_RECT_HACKFIX -DOPIE_NEW_MALLOC" +CXXFLAGS_append = " -DOPIE_NO_ERASE_RECT_HACKFIX -DOPIE_NEW_MALLOC" CXXFLAGS_append_c7x0 = " -DOPIE_NO_WINDOWED " CXXFLAGS_append_tosa = " -DOPIE_NO_WINDOWED " CXXFLAGS_append_spitz = " -DOPIE_NO_WINDOWED " |