diff options
| -rwxr-xr-x | contrib/angstrom/build-feeds.sh | 7 | ||||
| -rw-r--r-- | packages/gcc/gcc-4.3.2.inc | 2 | ||||
| -rw-r--r-- | packages/gcc/gcc-4.3.2/gcc-4.2.3-linux-multilib-fix.patch | 23 | ||||
| -rw-r--r-- | packages/gcc/gcc-cross4.inc | 2 | ||||
| -rw-r--r-- | packages/gcc/gcc-cross_4.3.2.bb | 2 | ||||
| -rw-r--r-- | packages/tasks/task-opie-all.bb | 2 |
6 files changed, 34 insertions, 4 deletions
diff --git a/contrib/angstrom/build-feeds.sh b/contrib/angstrom/build-feeds.sh index 2b00692625..7fc40a0a64 100755 --- a/contrib/angstrom/build-feeds.sh +++ b/contrib/angstrom/build-feeds.sh @@ -70,7 +70,12 @@ do xserver-kdrive xserver-xorg \ xf86-video-fbdev xf86-video-ati xf86-video-vesa \ xf86-input-evdev xf86-input-keyboard xf86-input-mouse \ - task-opie task-opie-all \ + task-opie task-opie-games task-opie-apps task-opie-all \ + konqueror-embedded ubahnnav freenote inkwp opie-notes mileage pocketcellar timesleuth zgscore \ + zlapspeed zuc zddice camera-assistant slcalc sliderulez resistorui qpe-nmap \ + atomic checkers fish glider hexatrolic icebloxx labyrinth mahjongg maki nmm pairs pdamaze \ + pipeman shisensho sokoban tron win4 zauralign ziq zrev7 zsubhunt ztappy zudoku iaimaster \ + qmatrix qfish2 froot \ task-openmoko-base task-openmoko-debug task-openmoko-examples task-openmoko-feed task-openmoko-games task-openmoko-linux task-openmoko-native-sdk task-openmoko-net task-openmoko-phone task-openmoko-pim task-openmoko-ui \ gsm0710muxd frameworkd zhone \ gnome-games \ diff --git a/packages/gcc/gcc-4.3.2.inc b/packages/gcc/gcc-4.3.2.inc index 21c08ffccc..74ed254694 100644 --- a/packages/gcc/gcc-4.3.2.inc +++ b/packages/gcc/gcc-4.3.2.inc @@ -60,8 +60,8 @@ SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \ SRC_URI_append_sh3 = " file://sh3-installfix-fixheaders.patch;patch=1 " SRC_URI_append_sh4 = " file://sh_unwind.patch;patch=1 \ + file://gcc-4.2.3-linux-multilib-fix.patch;patch=1 \ " - # Language Overrides FORTRAN = "" JAVA = "" diff --git a/packages/gcc/gcc-4.3.2/gcc-4.2.3-linux-multilib-fix.patch b/packages/gcc/gcc-4.3.2/gcc-4.2.3-linux-multilib-fix.patch new file mode 100644 index 0000000000..81522a8f57 --- /dev/null +++ b/packages/gcc/gcc-4.3.2/gcc-4.2.3-linux-multilib-fix.patch @@ -0,0 +1,23 @@ +Change gcc build : Enable m4 and m4-nofpu (needed for kernel) for sh4-gnu-linux + +Signed-off-by: Carl Shaw <carl.shaw@st.com> + +Index: gcc/gcc/config.gcc +=================================================================== +--- gcc.orig/gcc/config.gcc 2008-07-18 10:37:54.000000000 +0100 ++++ gcc/gcc/config.gcc 2008-07-18 11:00:42.000000000 +0100 +@@ -2097,11 +2097,12 @@ + if test x${sh_multilibs} = x ; then + case ${target} in + sh64-superh-linux* | \ +- sh[1234]*) sh_multilibs=${sh_cpu_target} ;; + sh64* | sh5*) sh_multilibs=m5-32media,m5-32media-nofpu,m5-compact,m5-compact-nofpu,m5-64media,m5-64media-nofpu ;; +- sh-superh-*) sh_multilibs=m4,m4-single,m4-single-only,m4-nofpu ;; ++ sh-superh-* | \ ++ sh4-*-linux*) sh_multilibs=m4,m4-nofpu ;; + sh*-*-linux*) sh_multilibs=m1,m3e,m4 ;; + sh*-*-netbsd*) sh_multilibs=m3,m3e,m4 ;; ++ sh[1234]*) sh_multilibs=${sh_cpu_target} ;; + *) sh_multilibs=m1,m2,m2e,m4,m4-single,m4-single-only,m2a,m2a-single ;; + esac + if test x$with_fp = xno; then diff --git a/packages/gcc/gcc-cross4.inc b/packages/gcc/gcc-cross4.inc index 3d3403737a..77a55968fa 100644 --- a/packages/gcc/gcc-cross4.inc +++ b/packages/gcc/gcc-cross4.inc @@ -1,3 +1,5 @@ require gcc-cross.inc DEPENDS += "gmp-native mpfr-native" + +EXTRA_OECONF_append_sh4 = " --with-multilib-list=m4,m4-nofpu " diff --git a/packages/gcc/gcc-cross_4.3.2.bb b/packages/gcc/gcc-cross_4.3.2.bb index 526ec1508b..18d5abd32e 100644 --- a/packages/gcc/gcc-cross_4.3.2.bb +++ b/packages/gcc/gcc-cross_4.3.2.bb @@ -1,4 +1,4 @@ -PR = "r4" +PR = "r5" require gcc-${PV}.inc require gcc-cross4.inc require gcc-configure-cross.inc diff --git a/packages/tasks/task-opie-all.bb b/packages/tasks/task-opie-all.bb index 47d2eba229..9f1403f050 100644 --- a/packages/tasks/task-opie-all.bb +++ b/packages/tasks/task-opie-all.bb @@ -14,7 +14,7 @@ PACKAGES = "task-opie-applets task-opie-inputmethods task-opie-styles \ # all OPIE stuff
#
RDEPENDS_task-opie-applets = "opie-aboutapplet opie-autorotateapplet opie-batteryapplet \
- opie-bluetoothapplet opie-brightnessapplet opie-cardmon \
+ opie-bluetoothapplet opie-brightnessapplet \
opie-clipboardapplet opie-clockapplet opie-homeapplet \
opie-irdaapplet opie-lockapplet opie-logoutapplet \
opie-mailapplet opie-memoryapplet opie-multikeyapplet \
|