summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--meta/recipes-devtools/guile/files/arm_aarch64.patch19
-rw-r--r--meta/recipes-devtools/guile/files/arm_endianness.patch23
-rw-r--r--meta/recipes-devtools/guile/files/debian/0002-Mark-Unused-modules-are-removed-gc-test-as-unresolve.patch39
-rw-r--r--meta/recipes-devtools/guile/files/debian/0003-Mark-mutex-with-owner-not-retained-threads-test-as-u.patch33
-rw-r--r--meta/recipes-devtools/guile/files/guile_2.0.6_fix_sed_error.patch24
-rw-r--r--meta/recipes-devtools/guile/files/libguile-Makefile.am-hook.patch42
-rw-r--r--meta/recipes-devtools/guile/files/opensuse/guile-64bit.patch39
-rw-r--r--meta/recipes-devtools/guile/files/workaround-ice-ssa-corruption.patch60
-rw-r--r--meta/recipes-devtools/guile/guile_2.0.14.bb124
9 files changed, 0 insertions, 403 deletions
diff --git a/meta/recipes-devtools/guile/files/arm_aarch64.patch b/meta/recipes-devtools/guile/files/arm_aarch64.patch
deleted file mode 100644
index f1788b62fb..0000000000
--- a/meta/recipes-devtools/guile/files/arm_aarch64.patch
+++ /dev/null
@@ -1,19 +0,0 @@
1guile: add aarch64 recognition
2
3Assume little-endian.
4
5Upstream-Status: Pending
6
7Signed-off-by: joe.slater@windriver.com
8
9--- a/module/system/base/target.scm
10+++ b/module/system/base/target.scm
11@@ -70,6 +70,8 @@
12 ((member cpu '("sparc" "sparc64" "powerpc" "powerpc64" "spu"
13 "mips" "mips64"))
14 (endianness big))
15+ ((string-match "^aarch64" cpu)
16+ (endianness little))
17 ((string-match "^arm.*eb" cpu)
18 (endianness big))
19 ((string-match "^arm.*" cpu)
diff --git a/meta/recipes-devtools/guile/files/arm_endianness.patch b/meta/recipes-devtools/guile/files/arm_endianness.patch
deleted file mode 100644
index ea4328b81d..0000000000
--- a/meta/recipes-devtools/guile/files/arm_endianness.patch
+++ /dev/null
@@ -1,23 +0,0 @@
1Support form ARM endianness
2
3Fixes Yocto bug# 2729
4
5Signed-off-by: Khem Raj <raj.khem@gmail.com>
6
7Upstream-Status: Pending
8
9Index: guile-2.0.5/module/system/base/target.scm
10===================================================================
11--- guile-2.0.5.orig/module/system/base/target.scm 2012-01-24 03:06:06.000000000 -0800
12+++ guile-2.0.5/module/system/base/target.scm 2012-07-12 13:05:44.372364103 -0700
13@@ -70,7 +70,9 @@
14 ((member cpu '("sparc" "sparc64" "powerpc" "powerpc64" "spu"
15 "mips" "mips64"))
16 (endianness big))
17- ((string-match "^arm.*el" cpu)
18+ ((string-match "^arm.*eb" cpu)
19+ (endianness big))
20+ ((string-match "^arm.*" cpu)
21 (endianness little))
22 (else
23 (error "unknown CPU endianness" cpu)))))
diff --git a/meta/recipes-devtools/guile/files/debian/0002-Mark-Unused-modules-are-removed-gc-test-as-unresolve.patch b/meta/recipes-devtools/guile/files/debian/0002-Mark-Unused-modules-are-removed-gc-test-as-unresolve.patch
deleted file mode 100644
index c7bf635ac7..0000000000
--- a/meta/recipes-devtools/guile/files/debian/0002-Mark-Unused-modules-are-removed-gc-test-as-unresolve.patch
+++ /dev/null
@@ -1,39 +0,0 @@
1Upstream-Status: Inappropriate [debian patch]
2
3Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
4
5From e52bfcdbaca5dce498678d8f512381e3e39a4066 Mon Sep 17 00:00:00 2001
6From: Rob Browning <rlb@defaultvalue.org>
7Date: Sun, 18 Mar 2012 11:40:55 -0500
8Subject: Mark "Unused modules are removed" gc test as unresolved.
9
10As per discussion with upstream, mark this test as unresolved since it
11may produce false negatives, depending on the behavior/timing of the
12garbage collector.
13---
14 test-suite/tests/gc.test | 11 ++++++-----
15 1 files changed, 6 insertions(+), 5 deletions(-)
16
17diff --git a/test-suite/tests/gc.test b/test-suite/tests/gc.test
18index a969752..8c8e13e 100644
19--- a/test-suite/tests/gc.test
20+++ b/test-suite/tests/gc.test
21@@ -84,11 +84,13 @@
22 ;; one gc round. not sure why.
23
24 (maybe-gc-flakiness
25- (= (let lp ((i 0))
26- (if (guard)
27- (lp (1+ i))
28- i))
29- total))))
30+ (or (= (let lp ((i 0))
31+ (if (guard)
32+ (lp (1+ i))
33+ i))
34+ total)
35+ (throw 'unresolved)))))
36+
37
38 (pass-if "Lexical vars are collectable"
39 (let ((l (compile
diff --git a/meta/recipes-devtools/guile/files/debian/0003-Mark-mutex-with-owner-not-retained-threads-test-as-u.patch b/meta/recipes-devtools/guile/files/debian/0003-Mark-mutex-with-owner-not-retained-threads-test-as-u.patch
deleted file mode 100644
index d3faf3e01a..0000000000
--- a/meta/recipes-devtools/guile/files/debian/0003-Mark-mutex-with-owner-not-retained-threads-test-as-u.patch
+++ /dev/null
@@ -1,33 +0,0 @@
1Upstream-Status: Inappropriate [debian patch]
2
3Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
4
5From 848543091d55dddb54a85612155964506d712852 Mon Sep 17 00:00:00 2001
6From: Rob Browning <rlb@defaultvalue.org>
7Date: Sun, 18 Mar 2012 13:28:24 -0500
8Subject: Mark "mutex with owner not retained" threads test as unresolved.
9
10As per discussion with upstream, mark this test as unresolved since it
11may produce false negatives, depending on the behavior/timing of the
12garbage collector.
13---
14 test-suite/tests/threads.test | 6 ++++--
15 1 files changed, 4 insertions(+), 2 deletions(-)
16
17diff --git a/test-suite/tests/threads.test b/test-suite/tests/threads.test
18index 85a7c38..50899cb 100644
19--- a/test-suite/tests/threads.test
20+++ b/test-suite/tests/threads.test
21@@ -414,8 +414,10 @@
22
23 (gc) (gc)
24 (let ((m (g)))
25- (and (mutex? m)
26- (eq? (mutex-owner m) (current-thread)))))))
27+ (or
28+ (and (mutex? m)
29+ (eq? (mutex-owner m) (current-thread)))
30+ (throw 'unresolved))))))
31
32 ;;
33 ;; mutex lock levels
diff --git a/meta/recipes-devtools/guile/files/guile_2.0.6_fix_sed_error.patch b/meta/recipes-devtools/guile/files/guile_2.0.6_fix_sed_error.patch
deleted file mode 100644
index 5597bb21f1..0000000000
--- a/meta/recipes-devtools/guile/files/guile_2.0.6_fix_sed_error.patch
+++ /dev/null
@@ -1,24 +0,0 @@
1Upstream-Status: Pending
2
3This fixes sed issue when prefix has / in it, like /usr/local
4
5autoreconf error avoided:
6| sed: -e expression #1, char 9: unknown option to `s'
7| configure.ac:39: error: AC_INIT should be called with package and version arguments
8
9Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
102012/05/01
11
12Index: guile-2.0.5/build-aux/git-version-gen
13===================================================================
14--- guile-2.0.5.orig/build-aux/git-version-gen
15+++ guile-2.0.5/build-aux/git-version-gen
16@@ -187,7 +187,7 @@ else
17 v=UNKNOWN
18 fi
19
20-v=`echo "$v" |sed "s/^$prefix//"`
21+v=`echo "$v" |sed "s#^$prefix##"`
22
23 # Test whether to append the "-dirty" suffix only if the version
24 # string we're using came from git. I.e., skip the test if it's "UNKNOWN"
diff --git a/meta/recipes-devtools/guile/files/libguile-Makefile.am-hook.patch b/meta/recipes-devtools/guile/files/libguile-Makefile.am-hook.patch
deleted file mode 100644
index 290b9d447d..0000000000
--- a/meta/recipes-devtools/guile/files/libguile-Makefile.am-hook.patch
+++ /dev/null
@@ -1,42 +0,0 @@
1From 9c4e120a7a87db34d22a50883a5a525170b480d7 Mon Sep 17 00:00:00 2001
2From: Robert Yang <liezhi.yang@windriver.com>
3Date: Tue, 6 Jan 2015 23:10:51 -0800
4Subject: [PATCH] libguile/Makefile.am: install-data-hook -> install-exec-hook
5
6It may install such a file:
7/usr/lib64/libguile-2.0*-gdb.scm
8
9This is because when there is no file in the directory:
10for f in libguile-2.0*; do
11 [snip]
12done
13
14The f would be libguile-2.0* itself, use install-exec-hook will fix the
15problem since it depends on install-libLTLIBRARIES.
16
17Upstream-Status: Pending
18
19Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
20---
21 libguile/Makefile.am | 4 +---
22 1 file changed, 1 insertion(+), 3 deletions(-)
23
24diff --git a/libguile/Makefile.am b/libguile/Makefile.am
25index 5decd99..52645b7 100644
26--- a/libguile/Makefile.am
27+++ b/libguile/Makefile.am
28@@ -446,10 +446,8 @@ EXTRA_libguile_@GUILE_EFFECTIVE_VERSION@_la_SOURCES = _scm.h \
29 ## delete guile-snarf.awk from the installation bindir, in case it's
30 ## lingering there due to an earlier guile version not having been
31 ## wiped out.
32-install-exec-hook:
33+install-exec-hook: libguile-2.0-gdb.scm
34 rm -f $(DESTDIR)$(bindir)/guile-snarf.awk
35-
36-install-data-hook: libguile-2.0-gdb.scm
37 @$(MKDIR_P) $(DESTDIR)$(libdir)
38 ## We want to install libguile-2.0-gdb.scm as SOMETHING-gdb.scm.
39 ## SOMETHING is the full name of the final library. We want to ignore
40--
411.7.9.5
42
diff --git a/meta/recipes-devtools/guile/files/opensuse/guile-64bit.patch b/meta/recipes-devtools/guile/files/opensuse/guile-64bit.patch
deleted file mode 100644
index da69b5fd7b..0000000000
--- a/meta/recipes-devtools/guile/files/opensuse/guile-64bit.patch
+++ /dev/null
@@ -1,39 +0,0 @@
1Upstream-Status: Inappropriate [opensuse patch]
2
3Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
4
5Index: guile-2.0.3/libguile/hash.c
6===================================================================
7--- guile-2.0.3.orig/libguile/hash.c 2011-07-06 15:49:59.000000000 -0700
8+++ guile-2.0.3/libguile/hash.c 2012-01-13 21:49:43.332844884 -0800
9@@ -270,7 +270,7 @@ scm_hasher(SCM obj, unsigned long n, siz
10 unsigned long
11 scm_ihashq (SCM obj, unsigned long n)
12 {
13- return (SCM_UNPACK (obj) >> 1) % n;
14+ return ((unsigned long) SCM_UNPACK (obj) >> 1) % n;
15 }
16
17
18@@ -306,7 +306,7 @@ scm_ihashv (SCM obj, unsigned long n)
19 if (SCM_NUMP(obj))
20 return (unsigned long) scm_hasher(obj, n, 10);
21 else
22- return SCM_UNPACK (obj) % n;
23+ return (unsigned long) SCM_UNPACK (obj) % n;
24 }
25
26
27Index: guile-2.0.3/libguile/struct.c
28===================================================================
29--- guile-2.0.3.orig/libguile/struct.c 2011-07-06 15:50:00.000000000 -0700
30+++ guile-2.0.3/libguile/struct.c 2012-01-13 21:49:43.332844884 -0800
31@@ -942,7 +942,7 @@ scm_struct_ihashq (SCM obj, unsigned lon
32 {
33 /* The length of the hash table should be a relative prime it's not
34 necessary to shift down the address. */
35- return SCM_UNPACK (obj) % n;
36+ return (unsigned long) SCM_UNPACK (obj) % n;
37 }
38
39 SCM_DEFINE (scm_struct_vtable_name, "struct-vtable-name", 1, 0, 0,
diff --git a/meta/recipes-devtools/guile/files/workaround-ice-ssa-corruption.patch b/meta/recipes-devtools/guile/files/workaround-ice-ssa-corruption.patch
deleted file mode 100644
index 6c348384a5..0000000000
--- a/meta/recipes-devtools/guile/files/workaround-ice-ssa-corruption.patch
+++ /dev/null
@@ -1,60 +0,0 @@
1libguile/vm-i-system.c: workaround ice ssa corruption while compiling with option -g -O
2
3While compiling with option -g -O, there was a ssa corruption:
4..
5Unable to coalesce ssa_names 48 and 3476 which are marked as MUST COALESCE.
6sp_48(ab) and sp_3476(ab)
7guile-2.0.11/libguile/vm-engine.c: In function 'vm_debug_engine':
8guile-2.0.11/libguile/vm.c:673:19: internal compiler error: SSA corruption
9 #define VM_NAME vm_debug_engine
10 ^
11guile-2.0.11/libguile/vm-engine.c:39:1: note: in expansion of macro 'VM_NAME'
12 VM_NAME (SCM vm, SCM program, SCM *argv, int nargs)
13 ^
14Please submit a full bug report,
15with preprocessed source if appropriate.
16See <http://gcc.gnu.org/bugs.html> for instructions.
17...
18
19Tweak libguile/vm-i-system.c to add boundary value check to workaround it.
20
21Upstream-Status: Pending
22
23Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
24---
25 libguile/vm-i-system.c | 20 ++++++++++++++++----
26 1 file changed, 16 insertions(+), 4 deletions(-)
27
28diff --git a/libguile/vm-i-system.c b/libguile/vm-i-system.c
29--- a/libguile/vm-i-system.c
30+++ b/libguile/vm-i-system.c
31@@ -625,10 +625,22 @@ VM_DEFINE_INSTRUCTION (47, bind_optionals_shuffle, "bind-optionals/shuffle", 6,
32 /* now shuffle up, from walk to ntotal */
33 {
34 scm_t_ptrdiff nshuf = sp - walk + 1, i;
35- sp = (fp - 1) + ntotal + nshuf;
36- CHECK_OVERFLOW ();
37- for (i = 0; i < nshuf; i++)
38- sp[-i] = walk[nshuf-i-1];
39+ /* check the value of nshuf to workaround ice ssa corruption */
40+ /* while compiling with -O -g */
41+ if (nshuf > 0)
42+ {
43+ sp = (fp - 1) + ntotal + nshuf;
44+ CHECK_OVERFLOW ();
45+ for (i = 0; i < nshuf; i++)
46+ sp[-i] = walk[nshuf-i-1];
47+ }
48+ else
49+ {
50+ sp = (fp - 1) + ntotal + nshuf;
51+ CHECK_OVERFLOW ();
52+ for (i = 0; i < nshuf; i++)
53+ sp[-i] = walk[nshuf-i-1];
54+ }
55 }
56 /* and fill optionals & keyword args with SCM_UNDEFINED */
57 while (walk <= (fp - 1) + ntotal)
58--
591.9.1
60
diff --git a/meta/recipes-devtools/guile/guile_2.0.14.bb b/meta/recipes-devtools/guile/guile_2.0.14.bb
deleted file mode 100644
index ef62ff8443..0000000000
--- a/meta/recipes-devtools/guile/guile_2.0.14.bb
+++ /dev/null
@@ -1,124 +0,0 @@
1SUMMARY = "Guile is the GNU Ubiquitous Intelligent Language for Extensions"
2DESCRIPTION = "Guile is the GNU Ubiquitous Intelligent Language for Extensions,\
3 the official extension language for the GNU operating system.\
4 Guile is a library designed to help programmers create flexible applications.\
5 Using Guile in an application allows the application's functionality to be\
6 extended by users or other programmers with plug-ins, modules, or scripts.\
7 Guile provides what might be described as 'practical software freedom,'\
8 making it possible for users to customize an application to meet their\
9 needs without digging into the application's internals."
10
11HOMEPAGE = "http://www.gnu.org/software/guile/"
12SECTION = "devel"
13LICENSE = "GPLv3"
14LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
15
16SRC_URI = "${GNU_MIRROR}/guile/guile-${PV}.tar.xz \
17 file://debian/0002-Mark-Unused-modules-are-removed-gc-test-as-unresolve.patch \
18 file://debian/0003-Mark-mutex-with-owner-not-retained-threads-test-as-u.patch \
19 file://opensuse/guile-64bit.patch \
20 file://guile_2.0.6_fix_sed_error.patch \
21 file://arm_endianness.patch \
22 file://arm_aarch64.patch \
23 file://workaround-ice-ssa-corruption.patch \
24 file://libguile-Makefile.am-hook.patch \
25 "
26
27SRC_URI[md5sum] = "c64977c775effd19393364b3018fd8cd"
28SRC_URI[sha256sum] = "e8442566256e1be14e51fc18839cd799b966bc5b16c6a1d7a7c35155a8619d82"
29
30inherit autotools gettext pkgconfig texinfo
31BBCLASSEXTEND = "native"
32
33# Fix "Argument list too long" error when len(TMPDIR) = 410
34acpaths = "-I ./m4"
35
36DEPENDS = "libunistring bdwgc gmp libtool libffi ncurses readline"
37# add guile-native only to the target recipe's DEPENDS
38DEPENDS_append_class-target = " guile-native libatomic-ops"
39
40# The comment of the script guile-config said it has been deprecated but we should
41# at least add the required dependency to make it work since we still provide the script.
42RDEPENDS_${PN} = "pkgconfig"
43
44RDEPENDS_${PN}_append_libc-glibc_class-target = " glibc-gconv-iso8859-1"
45
46EXTRA_OECONF += "${@['--without-libltdl-prefix --without-libgmp-prefix --without-libreadline-prefix', ''][bb.data.inherits_class('native',d)]}"
47
48EXTRA_OECONF_append_class-target = " --with-libunistring-prefix=${STAGING_LIBDIR} \
49 --with-libgmp-prefix=${STAGING_LIBDIR} \
50 --with-libltdl-prefix=${STAGING_LIBDIR}"
51
52CFLAGS_append_libc-musl = " -DHAVE_GC_SET_FINALIZER_NOTIFIER \
53 -DHAVE_GC_GET_HEAP_USAGE_SAFE \
54 -DHAVE_GC_GET_FREE_SPACE_DIVISOR \
55 -DHAVE_GC_SET_FINALIZE_ON_DEMAND \
56 "
57
58do_configure_prepend() {
59 mkdir -p po
60}
61
62export GUILE_FOR_BUILD="${BUILD_SYS}-guile"
63
64do_install_append_class-native() {
65 install -m 0755 ${D}${bindir}/guile ${D}${bindir}/${HOST_SYS}-guile
66
67 create_wrapper ${D}/${bindir}/guile \
68 GUILE_LOAD_PATH=${STAGING_DATADIR_NATIVE}/guile/2.0 \
69 GUILE_LOAD_COMPILED_PATH=${STAGING_LIBDIR_NATIVE}/guile/2.0/ccache
70 create_wrapper ${D}${bindir}/${HOST_SYS}-guile \
71 GUILE_LOAD_PATH=${STAGING_DATADIR_NATIVE}/guile/2.0 \
72 GUILE_LOAD_COMPILED_PATH=${STAGING_LIBDIR_NATIVE}/guile/2.0/ccache
73}
74
75do_install_append_class-target() {
76 # cleanup buildpaths in scripts
77 sed -i -e 's:${STAGING_DIR_NATIVE}::' ${D}${bindir}/guile-config
78 sed -i -e 's:${STAGING_DIR_HOST}::' ${D}${bindir}/guile-snarf
79
80 sed -i -e 's:${STAGING_DIR_TARGET}::g' ${D}${libdir}/pkgconfig/guile-2.0.pc
81}
82
83do_install_append_libc-musl() {
84 rm -f ${D}${libdir}/charset.alias
85}
86
87SYSROOT_PREPROCESS_FUNCS = "guile_cross_config"
88
89guile_cross_config() {
90 # this is only for target recipe
91 if [ "${PN}" = "guile" ]
92 then
93 # Create guile-config returning target values instead of native values
94 install -d ${SYSROOT_DESTDIR}${STAGING_BINDIR_CROSS}
95 printf '#!%s \\\n--no-auto-compile -e main -s\n!#\n(define %%guile-build-info %s(\n' $(which ${BUILD_SYS}-guile) "'" \
96 > ${B}/guile-config.cross
97 sed -n -e 's:^[ \t]*{[ \t]*": (:' \
98 -e 's:",[ \t]*": . ":' \
99 -e 's:" *}, *\\:"):' \
100 -e 's:^.*cachedir.*$::' \
101 -e '/^ (/p' \
102 < ${B}/libguile/libpath.h >> ${B}/guile-config.cross
103 echo '))' >> ${B}/guile-config.cross
104 cat ${B}/meta/guile-config >> ${B}/guile-config.cross
105 install ${B}/guile-config.cross ${STAGING_BINDIR_CROSS}/guile-config
106 fi
107}
108
109# Guile needs the compiled files to be newer than the source, and it won't
110# auto-compile into the prefix even if it can write there, so touch them here as
111# sysroot is managed.
112SSTATEPOSTINSTFUNCS += "guile_sstate_postinst"
113GUILESSTATEDIR = "${COMPONENTS_DIR}/${TUNE_PKGARCH}/${PN}/${libdir}/guile/2.0/ccache"
114GUILESSTATEDIR_class-native = "${COMPONENTS_DIR}/${BUILD_ARCH}/${PN}/${libdir_native}/guile/2.0/ccache"
115guile_sstate_postinst() {
116 if [ "${BB_CURRENTTASK}" = "populate_sysroot" -o "${BB_CURRENTTASK}" = "populate_sysroot_setscene" ]
117 then
118 find ${GUILESSTATEDIR} -type f | xargs touch
119 fi
120}
121
122# http://errors.yoctoproject.org/Errors/Details/20491/
123ARM_INSTRUCTION_SET_armv4 = "arm"
124ARM_INSTRUCTION_SET_armv5 = "arm"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-18 02:58:22 +0000