summaryrefslogtreecommitdiff
path: root/meta/recipes-devtools/guile
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2012-07-12 13:30:29 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-07-17 10:43:18 +0100
commitb537b035c9b9c9a1174dcafc0252c2b779b17902 (patch)
treeb64bdaed7226661c8f4f31e19951f2e395df92d9 /meta/recipes-devtools/guile
parent3f3b74b3fd6ba813dd69804706edcea145876e09 (diff)
downloadopenembedded-core-b537b035c9b9c9a1174dcafc0252c2b779b17902.tar.gz
openembedded-core-b537b035c9b9c9a1174dcafc0252c2b779b17902.tar.bz2
openembedded-core-b537b035c9b9c9a1174dcafc0252c2b779b17902.zip
guile: Fix missing depends and broken arm build
This patch adds a fix where arm endianness is detected correctly secondly it adds a missing dependency on libatomics-ops which was found when build in clean tmpdir and populating it from a valid sstate. Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/guile')
-rw-r--r--meta/recipes-devtools/guile/files/arm_endianness.patch23
-rw-r--r--meta/recipes-devtools/guile/guile_2.0.5.bb5
2 files changed, 26 insertions, 2 deletions
diff --git a/meta/recipes-devtools/guile/files/arm_endianness.patch b/meta/recipes-devtools/guile/files/arm_endianness.patch
new file mode 100644
index 0000000000..ea4328b81d
--- /dev/null
+++ b/meta/recipes-devtools/guile/files/arm_endianness.patch
@@ -0,0 +1,23 @@
+Support form ARM endianness
+
+Fixes Yocto bug# 2729
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+
+Upstream-Status: Pending
+
+Index: guile-2.0.5/module/system/base/target.scm
+===================================================================
+--- guile-2.0.5.orig/module/system/base/target.scm 2012-01-24 03:06:06.000000000 -0800
++++ guile-2.0.5/module/system/base/target.scm 2012-07-12 13:05:44.372364103 -0700
+@@ -70,7 +70,9 @@
+ ((member cpu '("sparc" "sparc64" "powerpc" "powerpc64" "spu"
+ "mips" "mips64"))
+ (endianness big))
+- ((string-match "^arm.*el" cpu)
++ ((string-match "^arm.*eb" cpu)
++ (endianness big))
++ ((string-match "^arm.*" cpu)
+ (endianness little))
+ (else
+ (error "unknown CPU endianness" cpu)))))
diff --git a/meta/recipes-devtools/guile/guile_2.0.5.bb b/meta/recipes-devtools/guile/guile_2.0.5.bb
index fc94a412a1..6c96f8764d 100644
--- a/meta/recipes-devtools/guile/guile_2.0.5.bb
+++ b/meta/recipes-devtools/guile/guile_2.0.5.bb
@@ -21,6 +21,7 @@ SRC_URI = "${GNU_MIRROR}/guile/guile-${PV}.tar.gz \
file://guile_2.0.5_disable_goops_optimizations.patch \
file://guile_2.0.5_fix_cross_compilation.patch \
file://remove-gets.patch \
+ file://arm_endianness.patch \
"
# file://debian/0001-Change-guile-to-guile-X.Y-for-info-pages.patch
@@ -29,14 +30,14 @@ SRC_URI = "${GNU_MIRROR}/guile/guile-${PV}.tar.gz \
SRC_URI[md5sum] = "bcf70d54b44c99cb9acd3f63c5486b4b"
SRC_URI[sha256sum] = "2a026ea6cdbc51ca71bcd9787839debfa45ac5db1e26dc00b30ca9b128b10956"
-PR = "r2"
+PR = "r3"
inherit autotools gettext
BBCLASSEXTEND = "native"
DEPENDS = "libunistring bdwgc gmp libtool libffi"
# add guile-native only to the target recipe's DEPENDS
-DEPENDS += "${@['guile-native', ''][d.getVar('PN', True) != 'guile']}"
+DEPENDS += "${@['guile-native libatomics-ops', ''][d.getVar('PN', True) != 'guile']}"
EXTRA_OECONF += "${@['--without-libltdl-prefix --without-libgmp-prefix', ''][bb.data.inherits_class('native',d)]}"