diff options
| author | Holger Hans Peter Freyther <zecke@selfish.org> | 2008-11-16 16:35:39 +0100 |
|---|---|---|
| committer | Holger Hans Peter Freyther <zecke@selfish.org> | 2008-11-16 16:35:39 +0100 |
| commit | 52abe8d77cbfed9c91a9cae7ed0a7e60aaf50b34 (patch) | |
| tree | 7f3b125c3485041c0488adf60390a1fdb230bf6c /packages | |
| parent | 9eaf1493b3c777d688ad992b9ecedd1cc18cf147 (diff) | |
| parent | ce5b19f9784561fb506bc564082e7a3d888a0c90 (diff) | |
Merge commit 'origin/org.openembedded.dev' into holger/openmoko-merges
Conflicts:
packages/tasks/task-openmoko-feed.bb
Diffstat (limited to 'packages')
115 files changed, 5123 insertions, 342 deletions
diff --git a/packages/accelges/accelges_svn.bb b/packages/accelges/accelges_svn.bb index 73c274a3d7..27abf44806 100644 --- a/packages/accelges/accelges_svn.bb +++ b/packages/accelges/accelges_svn.bb @@ -3,8 +3,9 @@ HOMEPAGE = "http://code.google.com/p/accelges/" AUTHOR = "Paul V. Borza" LICENSE = "GPL" DEPENDS = "libnotify" -PV = "0.2+svn${SRCREV}" +PV = "0.2+svnr${SRCREV}" PR = "r1" +PE = "1" SRC_URI = "svn://accelges.googlecode.com/svn/;module=trunk;proto=http" S = "${WORKDIR}/trunk" diff --git a/packages/alsa/alsa-scenario_git.bb b/packages/alsa/alsa-scenario_git.bb index 02edd31619..74c25c247e 100644 --- a/packages/alsa/alsa-scenario_git.bb +++ b/packages/alsa/alsa-scenario_git.bb @@ -3,8 +3,9 @@ HOMEPAGE = "http://opensource.wolfsonmicro.com/node/22" SECTION = "console/utils" LICENSE = "GPL" DEPENDS = "alsa-lib ncurses" -PV = "0.1+git${SRCREV}" +PV = "0.1+gitr${SRCREV}" PR = "r0" +PE = "1" SRC_URI = "git://opensource.wolfsonmicro.com/alsa-scenario;branch=master;protocol=git" S = "${WORKDIR}/git" diff --git a/packages/boost/boost_1.33.0.bb b/packages/boost/boost_1.33.0.bb deleted file mode 100644 index 520cf43a8d..0000000000 --- a/packages/boost/boost_1.33.0.bb +++ /dev/null @@ -1,8 +0,0 @@ -include boost.inc - -PR = "r1" - -SRC_URI = "${SOURCEFORGE_MIRROR}/boost/${BOOST_P}.tar.bz2" -#SRC_URI += "file://unit_test_log10f.patch;patch=1" -SRC_URI += "file://linux-uclibc.patch;patch=1" - diff --git a/packages/boost/boost_1.33.1.bb b/packages/boost/boost_1.33.1.bb index 840be8b784..71b8fc15b3 100644 --- a/packages/boost/boost_1.33.1.bb +++ b/packages/boost/boost_1.33.1.bb @@ -1,9 +1,11 @@ include boost.inc +PR = "r3" -PR = "r2" +SRC_URI = "\ + ${SOURCEFORGE_MIRROR}/boost/${BOOST_P}.tar.bz2 \ + file://linux-uclibc.patch;patch=1 \ + file://atomic_count_gcc_atomicity.patch;patch=1 \ + file://gcc43.patch;patch=1 \ + file://gcc41.patch;patch=1 \ +" -SRC_URI = "${SOURCEFORGE_MIRROR}/boost/${BOOST_P}.tar.bz2" -#SRC_URI += "file://unit_test_log10f.patch;patch=1" -SRC_URI += "file://linux-uclibc.patch;patch=1" -SRC_URI += "file://atomic_count_gcc_atomicity.patch;patch=1" -SRC_URI += "file://gcc43.patch;patch=1" diff --git a/packages/boost/files/gcc41.patch b/packages/boost/files/gcc41.patch new file mode 100644 index 0000000000..f91d1adf2b --- /dev/null +++ b/packages/boost/files/gcc41.patch @@ -0,0 +1,14 @@ +diff -ur boost_1_33_1.orig/boost/bind.hpp boost_1_33_1/boost/bind.hpp +--- boost_1_33_1.orig/boost/bind.hpp 2008-10-11 10:30:03.000000000 +0200 ++++ boost_1_33_1/boost/bind.hpp 2008-10-11 10:41:25.000000000 +0200 +@@ -28,6 +28,10 @@ + #include <boost/bind/arg.hpp> + #include <boost/detail/workaround.hpp> + ++#if __GNUC__ == 4 && __GNUC_MINOR__ == 1 ++# include <boost/visit_each.hpp> ++#endif ++ + // Borland-specific bug, visit_each() silently fails to produce code + + #if defined(__BORLANDC__) diff --git a/packages/cacao/cacao.inc b/packages/cacao/cacao.inc index 7df6c3712e..c22bbffd50 100644 --- a/packages/cacao/cacao.inc +++ b/packages/cacao/cacao.inc @@ -14,6 +14,8 @@ RPROVIDES_cacao = "java2-runtime" inherit java autotools update-alternatives +ARM_INSTRUCTION_SET = "arm" + # Configure options compatible with Cacao >= 0.99 only! |