diff options
| -rw-r--r-- | conf/distro/ucslugc.conf | 2 | ||||
| -rw-r--r-- | packages/alsa/alsa-lib_1.0.8.bb | 6 | ||||
| -rw-r--r-- | packages/monotone/monotone-5_0.22.bb | 5 | ||||
| -rw-r--r-- | packages/uclibc/uclibc_0.9.28.bb | 5 | ||||
| -rw-r--r-- | packages/util-linux/util-linux_2.12q.bb | 4 |
5 files changed, 20 insertions, 2 deletions
diff --git a/conf/distro/ucslugc.conf b/conf/distro/ucslugc.conf index b71352d070..1ce549349d 100644 --- a/conf/distro/ucslugc.conf +++ b/conf/distro/ucslugc.conf @@ -15,7 +15,7 @@ TARGET_OS = "linux-uclibc" # Select thumb-interwork and (TBD) thumb ARM_INTERWORK = ":thumb-interwork" -#ARM_INSTRUCTION_SET = ":thumb" +ARM_INSTRUCTION_SET = ":thumb" USE_NLS ?= "no" USE_NLS_glib-2.0 = "yes" diff --git a/packages/alsa/alsa-lib_1.0.8.bb b/packages/alsa/alsa-lib_1.0.8.bb index a58b21f532..49ee525318 100644 --- a/packages/alsa/alsa-lib_1.0.8.bb +++ b/packages/alsa/alsa-lib_1.0.8.bb @@ -4,6 +4,12 @@ SECTION = "libs/multimedia" LICENSE = "GPL" PR = "r1" +# configure.in sets -D__arm__ on the command line for any arm system +# (not just those with the ARM instruction set), this should be removed, +# (or replaced by a permitted #define). +#FIXME: remove the following +ARM_INSTRUCTION_SET = "" + SRC_URI = "ftp://ftp.alsa-project.org/pub/lib/alsa-lib-${PV}.tar.bz2" inherit autotools pkgconfig diff --git a/packages/monotone/monotone-5_0.22.bb b/packages/monotone/monotone-5_0.22.bb index c646fc2724..6de29e54b1 100644 --- a/packages/monotone/monotone-5_0.22.bb +++ b/packages/monotone/monotone-5_0.22.bb @@ -1,3 +1,8 @@ +# Release 0.22 reveals bugs in g++ for thumb (g++ generates +# relocations which the linker cannot represent) +#FIXME: remove the following +ARM_INSTRUCTION_SET = "" + include monotone.inc PR = "r0" diff --git a/packages/uclibc/uclibc_0.9.28.bb b/packages/uclibc/uclibc_0.9.28.bb index 246e9bc772..8805f9ff2b 100644 --- a/packages/uclibc/uclibc_0.9.28.bb +++ b/packages/uclibc/uclibc_0.9.28.bb @@ -1,5 +1,5 @@ DEFAULT_PREFERENCE = "1" -PR = "r1" +PR = "r2" include uclibc.inc @@ -12,6 +12,9 @@ SRC_URI += "http://www.uclibc.org/downloads/uClibc-${PV}.tar.bz2" S = "${WORKDIR}/uClibc-${PV}" +# At present the thumb implementation is non-functional +ARM_INSTRUCTION_SET = "" + #*** PATCHES *** # # The nokernelheadercheck patch removes the check on the include diff --git a/packages/util-linux/util-linux_2.12q.bb b/packages/util-linux/util-linux_2.12q.bb index 152e5fe976..93b96cb5e1 100644 --- a/packages/util-linux/util-linux_2.12q.bb +++ b/packages/util-linux/util-linux_2.12q.bb @@ -1,3 +1,7 @@ +# fdisk gets a #error unknown architecture when compiling for ARM thumb +#FIXME: remove this +ARM_INSTRUCTION_SET = "" + include util-linux.inc PR = "r2" |