diff options
| author | Holger Freyther <zecke@selfish.org> | 2006-02-20 14:57:26 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-02-20 14:57:26 +0000 |
| commit | 7aef1c122c7a4ce05aecd47d08164359c8763787 (patch) | |
| tree | a94ca48dadc77d6d68216f65457a6e3a4d1b643d | |
| parent | 63cc5ff527c6e258ec58f7e8b9f6f6d7e6a8746d (diff) | |
gtk-webcore:
Default to 1.0 if no PREFERRED_VERSION
gcc-cross is set.
| -rw-r--r-- | packages/gtk-webcore/osb-browser_20060212.bb | 2 | ||||
| -rw-r--r-- | packages/gtk-webcore/osb-jscore_20060212.bb | 2 | ||||
| -rw-r--r-- | packages/gtk-webcore/osb-nrcit_20060212.bb | 2 | ||||
| -rw-r--r-- | packages/gtk-webcore/osb-nrcore_20060212.bb | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/packages/gtk-webcore/osb-browser_20060212.bb b/packages/gtk-webcore/osb-browser_20060212.bb index d45319cb8a..e7ff63949f 100644 --- 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 d8e3a9b8f8..91b2b474d5 100644 --- 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 7530bb5719..6f3502e418 100644 --- 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 4ab4275071..44eebcc753 100644 --- 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" |