gtk-webcore:

	Default to 1.0 if no PREFERRED_VERSION
	gcc-cross is set.

diff --git a/packages/gtk-webcore/osb-browser_20060212.bb b/packages/gtk-webcore/osb-browser_20060212.bb
index d45319c..e7ff639 100644 (file)
--- a/packages/gtk-webcore/osb-browser_20060212.bb
+++ b/packages/gtk-webcore/osb-browser_20060212.bb
@@ -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

diff --git a/packages/gtk-webcore/osb-jscore_20060212.bb b/packages/gtk-webcore/osb-jscore_20060212.bb
index d8e3a9b..91b2b47 100644 (file)
--- a/packages/gtk-webcore/osb-jscore_20060212.bb
+++ b/packages/gtk-webcore/osb-jscore_20060212.bb
@@ -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
 

diff --git a/packages/gtk-webcore/osb-nrcit_20060212.bb b/packages/gtk-webcore/osb-nrcit_20060212.bb
index 7530bb5..6f3502e 100644 (file)
--- a/packages/gtk-webcore/osb-nrcit_20060212.bb
+++ b/packages/gtk-webcore/osb-nrcit_20060212.bb
@@ -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
 

diff --git a/packages/gtk-webcore/osb-nrcore_20060212.bb b/packages/gtk-webcore/osb-nrcore_20060212.bb
index 4ab4275..44eebcc 100644 (file)
--- a/packages/gtk-webcore/osb-nrcore_20060212.bb
+++ b/packages/gtk-webcore/osb-nrcore_20060212.bb
@@ -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"