summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorJonathan Liu <net147@gmail.com>2013-05-03 06:43:25 +1000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-05-08 15:41:13 +0100
commit4bf8253af7f5d28e81dd0c5d150712b36b14e741 (patch)
tree5bc6d891d860079f0aa3b792091ffe359681700b /meta
parentabb69cdfef6feaa445ad98524f9056ae363a3760 (diff)
downloadpoky-4bf8253af7f5d28e81dd0c5d150712b36b14e741.tar.gz
guile: Update to 2.0.9
fix_parallel_build_issue.patch is now part of upstream. (From OE-Core rev: 87cb30d988843ab1159d23789cd334aaf2a77e34) Signed-off-by: Jonathan Liu <net147@gmail.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/guile/files/fix_parallel_build_issue.patch20
-rw-r--r--meta/recipes-devtools/guile/guile_2.0.9.bb (renamed from meta/recipes-devtools/guile/guile_2.0.7.bb)7
2 files changed, 3 insertions, 24 deletions
diff --git a/meta/recipes-devtools/guile/files/fix_parallel_build_issue.patch b/meta/recipes-devtools/guile/files/fix_parallel_build_issue.patch
deleted file mode 100644
index 761d51b943..0000000000
--- a/meta/recipes-devtools/guile/files/fix_parallel_build_issue.patch
+++ /dev/null
@@ -1,20 +0,0 @@
1Add explicit dependency for libpath.h on dynl.x which fixes a potential parallel build issue.
2
3Fixes Yocto bug# 3558
4
5Signed-off-by: Bogdan Marinescu <bogdan.a.marinescu@intel.com>
6
7Upstream-Status: Pending
8
9diff --git a/libguile/Makefile.am b/libguile/Makefile.am
10index e216435..016bd90 100644
11--- a/libguile/Makefile.am
12+++ b/libguile/Makefile.am
13@@ -700,6 +700,7 @@ $(DOT_DOC_FILES) $(EXTRA_DOT_DOC_FILES): scmconfig.h snarf.h guile-snarf-docs.in
14 error.x: cpp-E.c
15 posix.x: cpp-SIG.c
16 load.x: libpath.h
17+dynl.x: libpath.h
18
19 alldotdocfiles = $(DOT_DOC_FILES) $(EXTRA_DOT_DOC_FILES)
20 snarf2checkedtexi = GUILE_AUTO_COMPILE=0 $(top_builddir)/meta/uninstalled-env guild snarf-check-and-output-texi
diff --git a/meta/recipes-devtools/guile/guile_2.0.7.bb b/meta/recipes-devtools/guile/guile_2.0.9.bb
index b8ab88e1ee..617f7ce4b1 100644
--- a/meta/recipes-devtools/guile/guile_2.0.7.bb
+++ b/meta/recipes-devtools/guile/guile_2.0.9.bb
@@ -19,16 +19,15 @@ SRC_URI = "${GNU_MIRROR}/guile/guile-${PV}.tar.xz \
19 file://opensuse/guile-64bit.patch \ 19 file://opensuse/guile-64bit.patch \
20 file://guile_2.0.6_fix_sed_error.patch \ 20 file://guile_2.0.6_fix_sed_error.patch \
21 file://arm_endianness.patch \ 21 file://arm_endianness.patch \
22 file://fix_parallel_build_issue.patch \
23 " 22 "
24 23
25# file://debian/0001-Change-guile-to-guile-X.Y-for-info-pages.patch 24# file://debian/0001-Change-guile-to-guile-X.Y-for-info-pages.patch
26# file://opensuse/guile-turn-off-gc-test.patch 25# file://opensuse/guile-turn-off-gc-test.patch
27 26
28SRC_URI[md5sum] = "30ff9e94663a2e2098b52f8ce9d050b9" 27SRC_URI[md5sum] = "a69b575d4a633bdd9118f3a4a1e97766"
29SRC_URI[sha256sum] = "6f278fa699685382ae51ba8bfad5840959e0af6414f3ad803d61131567bfa338" 28SRC_URI[sha256sum] = "f70a38c8d9751f442679bfe61852bba8545af4d4355d037630997c2f37f2895b"
30 29
31PR = "r1" 30PR = "r0"
32 31
33inherit autotools gettext 32inherit autotools gettext
34BBCLASSEXTEND = "native" 33BBCLASSEXTEND = "native"