]> git.openpandora.org Git - openembedded.git/commitdiff
gtk-webcore:
authorHolger Freyther <zecke@selfish.org>
Mon, 20 Feb 2006 14:57:26 +0000 (14:57 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 20 Feb 2006 14:57:26 +0000 (14:57 +0000)
Default to 1.0 if no PREFERRED_VERSION
gcc-cross is set.

packages/gtk-webcore/osb-browser_20060212.bb
packages/gtk-webcore/osb-jscore_20060212.bb
packages/gtk-webcore/osb-nrcit_20060212.bb
packages/gtk-webcore/osb-nrcore_20060212.bb

index d45319cb8a61a1ab9b9eeaed627ee9cca8e0c4a7..e7ff63949f7f7c64be711531e354465c350d960e 100644 (file)
@@ -16,6 +16,6 @@ SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/gtk-webcore;module=osb-br
            file://no-pedantic.patch;patch=1"
 S = "${WORKDIR}/osb-browser"
 
-DEFAULT_PREFERENCE = "${@['-1', '1'][bb.data.getVar('PREFERRED_VERSION_gcc-cross', d, 1).split('.')[0] == '4']}"
+DEFAULT_PREFERENCE = "${@['-1', '1'][(bb.data.getVar('PREFERRED_VERSION_gcc-cross', d, 1) or "1.0").split('.')[0] == '4' or False]}"
 
 inherit autotools
index d8e3a9b8f804e1aad5d01dfc4340a60996cb927d..91b2b474d5f0ff0ae92e8b438dfb29e25d27eea9 100644 (file)
@@ -13,7 +13,7 @@ SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/gtk-webcore;module=JavaSc
            file://gcc4-fno-threadsafe-statics-JavaScriptCore.patch;patch=1"
 S = "${WORKDIR}/JavaScriptCore"
 
-DEFAULT_PREFERENCE = "${@['-1', '1'][bb.data.getVar('PREFERRED_VERSION_gcc-cross', d, 1).split('.')[0] == '4']}"
+DEFAULT_PREFERENCE = "${@['-1', '1'][(bb.data.getVar('PREFERRED_VERSION_gcc-cross', d, 1) or "1.0").split('.')[0] == '4' or False]}"
 
 inherit autotools pkgconfig
 
index 7530bb571918febea860d2fbb72fbe42facc5647..6f3502e41891078b630312c431aa03cf4d7dfc6d 100644 (file)
@@ -16,7 +16,7 @@ SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/gtk-webcore;module=NRCit;
            file://gcc4-fno-threadsafe-statics-NRCit.patch;patch=1"
 S = "${WORKDIR}/NRCit"
 
-DEFAULT_PREFERENCE = "${@['-1', '1'][bb.data.getVar('PREFERRED_VERSION_gcc-cross', d, 1).split('.')[0] == '4']}"
+DEFAULT_PREFERENCE = "${@['-1', '1'][(bb.data.getVar('PREFERRED_VERSION_gcc-cross', d, 1) or "1.0").split('.')[0] == '4' or False]}"
 
 inherit autotools pkgconfig
 
index 4ab42750717cc65662dcc898e6d6b23b99aa6b6b..44eebcc753986fbe0515679cc6ce9e4f951eb79c 100644 (file)
@@ -16,7 +16,7 @@ SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/gtk-webcore;module=NRCore
            file://gcc4-fno-threadsafe-statics-NRCore.patch;patch=1"
 S = "${WORKDIR}/NRCore"
 
-DEFAULT_PREFERENCE = "${@['-1', '1'][bb.data.getVar('PREFERRED_VERSION_gcc-cross', d, 1).split('.')[0] == '4']}"
+DEFAULT_PREFERENCE = "${@['-1', '1'][(bb.data.getVar('PREFERRED_VERSION_gcc-cross', d, 1) or "1.0").split('.')[0] == '4' or False]}"
 
 LEAD_SONAME = "libnrcore.so"