From c527fd1f14c27855a37f2e8ac5346ce8d940ced2 Mon Sep 17 00:00:00 2001 From: Tudor Florea Date: Thu, 16 Oct 2014 03:05:19 +0200 Subject: initial commit for Enea Linux 4.0-140929 Migrated from the internal git server on the daisy-enea-point-release branch Signed-off-by: Tudor Florea --- .../guile/files/arm_endianness.patch | 23 ++++++++ ...-modules-are-removed-gc-test-as-unresolve.patch | 39 +++++++++++++ ...with-owner-not-retained-threads-test-as-u.patch | 33 +++++++++++ .../guile/files/guile_2.0.6_fix_sed_error.patch | 24 ++++++++ .../guile/files/guile_2.0.9_fix_noreturn.patch | 65 ++++++++++++++++++++++ .../guile/files/opensuse/guile-64bit.patch | 39 +++++++++++++ .../files/opensuse/guile-turn-off-gc-test.patch | 49 ++++++++++++++++ 7 files changed, 272 insertions(+) create mode 100644 meta/recipes-devtools/guile/files/arm_endianness.patch create mode 100644 meta/recipes-devtools/guile/files/debian/0002-Mark-Unused-modules-are-removed-gc-test-as-unresolve.patch create mode 100644 meta/recipes-devtools/guile/files/debian/0003-Mark-mutex-with-owner-not-retained-threads-test-as-u.patch create mode 100644 meta/recipes-devtools/guile/files/guile_2.0.6_fix_sed_error.patch create mode 100644 meta/recipes-devtools/guile/files/guile_2.0.9_fix_noreturn.patch create mode 100644 meta/recipes-devtools/guile/files/opensuse/guile-64bit.patch create mode 100644 meta/recipes-devtools/guile/files/opensuse/guile-turn-off-gc-test.patch (limited to 'meta/recipes-devtools/guile/files') 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 + +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/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 new file mode 100644 index 0000000000..43238a7d2e --- /dev/null +++ b/meta/recipes-devtools/guile/files/debian/0002-Mark-Unused-modules-are-removed-gc-test-as-unresolve.patch @@ -0,0 +1,39 @@ +Upstream-Status: Inappropriate [debian patch] + +Signed-Off-by: Nitin A Kamble + +From e52bfcdbaca5dce498678d8f512381e3e39a4066 Mon Sep 17 00:00:00 2001 +From: Rob Browning +Date: Sun, 18 Mar 2012 11:40:55 -0500 +Subject: Mark "Unused modules are removed" gc test as unresolved. + +As per discussion with upstream, mark this test as unresolved since it +may produce false negatives, depending on the behavior/timing of the +garbage collector. +--- + test-suite/tests/gc.test | 11 ++++++----- + 1 files changed, 6 insertions(+), 5 deletions(-) + +diff --git a/test-suite/tests/gc.test b/test-suite/tests/gc.test +index a969752..8c8e13e 100644 +--- a/test-suite/tests/gc.test ++++ b/test-suite/tests/gc.test +@@ -84,11 +84,13 @@ + ;; one gc round. not sure why. + + (maybe-gc-flakiness +- (= (let lp ((i 0)) +- (if (guard) +- (lp (1+ i)) +- i)) +- total)))) ++ (or (= (let lp ((i 0)) ++ (if (guard) ++ (lp (1+ i)) ++ i)) ++ total) ++ (throw 'unresolved))))) ++ + + (pass-if "Lexical vars are collectable" + (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 new file mode 100644 index 0000000000..34be3b96e7 --- /dev/null +++ b/meta/recipes-devtools/guile/files/debian/0003-Mark-mutex-with-owner-not-retained-threads-test-as-u.patch @@ -0,0 +1,33 @@ +Upstream-Status: Inappropriate [debian patch] + +Signed-Off-by: Nitin A Kamble + +From 848543091d55dddb54a85612155964506d712852 Mon Sep 17 00:00:00 2001 +From: Rob Browning +Date: Sun, 18 Mar 2012 13:28:24 -0500 +Subject: Mark "mutex with owner not retained" threads test as unresolved. + +As per discussion with upstream, mark this test as unresolved since it +may produce false negatives, depending on the behavior/timing of the +garbage collector. +--- + test-suite/tests/threads.test | 6 ++++-- + 1 files changed, 4 insertions(+), 2 deletions(-) + +diff --git a/test-suite/tests/threads.test b/test-suite/tests/threads.test +index 85a7c38..50899cb 100644 +--- a/test-suite/tests/threads.test ++++ b/test-suite/tests/threads.test +@@ -414,8 +414,10 @@ + + (gc) (gc) + (let ((m (g))) +- (and (mutex? m) +- (eq? (mutex-owner m) (current-thread))))))) ++ (or ++ (and (mutex? m) ++ (eq? (mutex-owner m) (current-thread))) ++ (throw 'unresolved)))))) + + ;; + ;; 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 new file mode 100644 index 0000000000..e5dc226370 --- /dev/null +++ b/meta/recipes-devtools/guile/files/guile_2.0.6_fix_sed_error.patch @@ -0,0 +1,24 @@ +Upstream-Status: Pending + +This fixes sed issue when prefix has / in it, like /usr/local + +autoreconf error avoided: +| sed: -e expression #1, char 9: unknown option to `s' +| configure.ac:39: error: AC_INIT should be called with package and version arguments + +Signed-Off-by: Nitin A Kamble +2012/05/01 + +Index: guile-2.0.5/build-aux/git-version-gen +=================================================================== +--- guile-2.0.5.orig/build-aux/git-version-gen ++++ guile-2.0.5/build-aux/git-version-gen +@@ -187,7 +187,7 @@ else + v=UNKNOWN + fi + +-v=`echo "$v" |sed "s/^$prefix//"` ++v=`echo "$v" |sed "s#^$prefix##"` + + # Test whether to append the "-dirty" suffix only if the version + # string we're using came from git. I.e., skip the test if it's "UNKNOWN" diff --git a/meta/recipes-devtools/guile/files/guile_2.0.9_fix_noreturn.patch b/meta/recipes-devtools/guile/files/guile_2.0.9_fix_noreturn.patch new file mode 100644 index 0000000000..3f65dce72c --- /dev/null +++ b/meta/recipes-devtools/guile/files/guile_2.0.9_fix_noreturn.patch @@ -0,0 +1,65 @@ +From 36c40440078c005cd5e239cca487d29f6f60007d Mon Sep 17 00:00:00 2001 +From: Mark H Weaver +Date: Mon, 4 Nov 2013 19:41:52 -0500 +Subject: [PATCH] Don't use the identifier 'noreturn'. + +Fixes . +Reported by Matt Sicker . + +* libguile/__scm.h (SCM_NORETURN): Use ((__noreturn__)) instead of + ((noreturn)). + +* libguile/throw.h (scm_ithrow): Rename formal parameter from 'noreturn' + to 'no_return'. + +* libguile/throw.c (scm_ithrow): Rename formal parameter from 'noreturn' + to 'no_return'. +--- + libguile/__scm.h | 2 +- + libguile/throw.c | 2 +- + libguile/throw.h | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +Upstream-Status: Backport + +diff --git a/libguile/__scm.h b/libguile/__scm.h +index ed35d53..a0b02b6 100644 +--- a/libguile/__scm.h ++++ b/libguile/__scm.h +@@ -77,7 +77,7 @@ + * 1) int foo (char arg) SCM_NORETURN; + */ + #ifdef __GNUC__ +-#define SCM_NORETURN __attribute__ ((noreturn)) ++#define SCM_NORETURN __attribute__ ((__noreturn__)) + #else + #define SCM_NORETURN + #endif +diff --git a/libguile/throw.c b/libguile/throw.c +index 9c29351..7fc9edf 100644 +--- a/libguile/throw.c ++++ b/libguile/throw.c +@@ -436,7 +436,7 @@ scm_handle_by_throw (void *handler_data SCM_UNUSED, SCM tag, SCM args) + } + + SCM +-scm_ithrow (SCM key, SCM args, int noreturn SCM_UNUSED) ++scm_ithrow (SCM key, SCM args, int no_return SCM_UNUSED) + { + return scm_throw (key, args); + } +diff --git a/libguile/throw.h b/libguile/throw.h +index 6cf6790..62592d2 100644 +--- a/libguile/throw.h ++++ b/libguile/throw.h +@@ -79,7 +79,7 @@ SCM_API int scm_exit_status (SCM args); + SCM_API SCM scm_catch_with_pre_unwind_handler (SCM tag, SCM thunk, SCM handler, SCM lazy_handler); + SCM_API SCM scm_catch (SCM tag, SCM thunk, SCM handler); + SCM_API SCM scm_with_throw_handler (SCM tag, SCM thunk, SCM handler); +-SCM_API SCM scm_ithrow (SCM key, SCM args, int noreturn); ++SCM_API SCM scm_ithrow (SCM key, SCM args, int no_return); + + SCM_API SCM scm_throw (SCM key, SCM args); + SCM_INTERNAL void scm_init_throw (void); +-- +1.7.2.5 diff --git a/meta/recipes-devtools/guile/files/opensuse/guile-64bit.patch b/meta/recipes-devtools/guile/files/opensuse/guile-64bit.patch new file mode 100644 index 0000000000..d3e312f770 --- /dev/null +++ b/meta/recipes-devtools/guile/files/opensuse/guile-64bit.patch @@ -0,0 +1,39 @@ +Upstream-Status: Inappropriate [opensuse patch] + +Signed-Off-by: Nitin A Kamble + +Index: guile-2.0.3/libguile/hash.c +=================================================================== +--- guile-2.0.3.orig/libguile/hash.c 2011-07-06 15:49:59.000000000 -0700 ++++ guile-2.0.3/libguile/hash.c 2012-01-13 21:49:43.332844884 -0800 +@@ -270,7 +270,7 @@ scm_hasher(SCM obj, unsigned long n, siz + unsigned long + scm_ihashq (SCM obj, unsigned long n) + { +- return (SCM_UNPACK (obj) >> 1) % n; ++ return ((unsigned long) SCM_UNPACK (obj) >> 1) % n; + } + + +@@ -306,7 +306,7 @@ scm_ihashv (SCM obj, unsigned long n) + if (SCM_NUMP(obj)) + return (unsigned long) scm_hasher(obj, n, 10); + else +- return SCM_UNPACK (obj) % n; ++ return (unsigned long) SCM_UNPACK (obj) % n; + } + + +Index: guile-2.0.3/libguile/struct.c +=================================================================== +--- guile-2.0.3.orig/libguile/struct.c 2011-07-06 15:50:00.000000000 -0700 ++++ guile-2.0.3/libguile/struct.c 2012-01-13 21:49:43.332844884 -0800 +@@ -942,7 +942,7 @@ scm_struct_ihashq (SCM obj, unsigned lon + { + /* The length of the hash table should be a relative prime it's not + necessary to shift down the address. */ +- return SCM_UNPACK (obj) % n; ++ return (unsigned long) SCM_UNPACK (obj) % n; + } + + SCM_DEFINE (scm_struct_vtable_name, "struct-vtable-name", 1, 0, 0, diff --git a/meta/recipes-devtools/guile/files/opensuse/guile-turn-off-gc-test.patch b/meta/recipes-devtools/guile/files/opensuse/guile-turn-off-gc-test.patch new file mode 100644 index 0000000000..e201486284 --- /dev/null +++ b/meta/recipes-devtools/guile/files/opensuse/guile-turn-off-gc-test.patch @@ -0,0 +1,49 @@ +Upstream-Status: Inappropriate [opensuse patch] + +Signed-Off-by: Nitin A Kamble + +See http://debbugs.gnu.org/cgi/bugreport.cgi?bug=10096 +why this test is turned off. +Index: guile-2.0.3/test-suite/tests/gc.test +=================================================================== +--- guile-2.0.3.orig/test-suite/tests/gc.test 2011-10-15 09:34:40.000000000 -0700 ++++ guile-2.0.3/test-suite/tests/gc.test 2012-01-13 21:52:10.282540355 -0800 +@@ -65,23 +65,23 @@ + foo))) + + +-(with-test-prefix "gc" +- (pass-if "Unused modules are removed" +- (let* ((guard (make-guardian)) +- (total 1000)) +- +- (for-each (lambda (x) (guard (make-module))) (iota total)) ++;;(with-test-prefix "gc" ++;; (pass-if "Unused modules are removed" ++;; (let* ((guard (make-guardian)) ++;; (total 1000)) ++;; ++;; (for-each (lambda (x) (guard (make-module))) (iota total)) + + ;; Avoid false references to the modules on the stack. +- (stack-cleanup 20) ++;; (stack-cleanup 20) + +- (gc) +- (gc) ;; twice: have to kill the weak vectors. +- (gc) ;; thrice: because the test doesn't succeed with only ++;; (gc) ++;; (gc) ;; twice: have to kill the weak vectors. ++;; (gc) ;; thrice: because the test doesn't succeed with only + ;; one gc round. not sure why. + +- (= (let lp ((i 0)) +- (if (guard) +- (lp (1+ i)) +- i)) +- total)))) ++;; (= (let lp ((i 0)) ++;; (if (guard) ++;; (lp (1+ i)) ++;; i)) ++;; total)))) -- cgit v1.2.3-54-g00ecf