mirror of
https://git.yoctoproject.org/poky
synced 2026-05-08 17:19:20 +00:00
guile: new recipe for autogen
guile recipe is needed by autogen. Imported & updated the guile-cross-config generation & guile-2.0.pc manipulation code from the meta-oe guile recipe. (From OE-Core rev: 7726884826332387180cd24ebe565cd13a193e13) Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
225a24a390
commit
34f4ab18bd
+33
@@ -0,0 +1,33 @@
|
||||
Upstream-Status: Inappropriate [debian patch]
|
||||
|
||||
From c53b49c63d7ed145fbaa3dde25063c407631f373 Mon Sep 17 00:00:00 2001
|
||||
From: Rob Browning <rlb@defaultvalue.org>
|
||||
Date: Sat, 23 Apr 2011 14:57:49 -0500
|
||||
Subject: Fix the SRFI 60 copy-bit documentation.
|
||||
|
||||
---
|
||||
libguile/srfi-60.c | 4 ++--
|
||||
1 files changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/libguile/srfi-60.c b/libguile/srfi-60.c
|
||||
index 264f4cb..1ed3c9e 100644
|
||||
--- a/libguile/srfi-60.c
|
||||
+++ b/libguile/srfi-60.c
|
||||
@@ -70,7 +70,7 @@ SCM_DEFINE (scm_srfi60_log2_binary_factors, "log2-binary-factors", 1, 0, 0,
|
||||
|
||||
|
||||
SCM_DEFINE (scm_srfi60_copy_bit, "copy-bit", 3, 0, 0,
|
||||
- (SCM index, SCM n, SCM bit),
|
||||
+ (SCM index, SCM n, SCM newbit),
|
||||
"Return @var{n} with the bit at @var{index} set according to\n"
|
||||
"@var{newbit}. @var{newbit} should be @code{#t} to set the bit\n"
|
||||
"to 1, or @code{#f} to set it to 0. Bits other than at\n"
|
||||
@@ -86,7 +86,7 @@ SCM_DEFINE (scm_srfi60_copy_bit, "copy-bit", 3, 0, 0,
|
||||
int bb;
|
||||
|
||||
ii = scm_to_ulong (index);
|
||||
- bb = scm_to_bool (bit);
|
||||
+ bb = scm_to_bool (newbit);
|
||||
|
||||
if (SCM_I_INUMP (n))
|
||||
{
|
||||
+25
@@ -0,0 +1,25 @@
|
||||
Upstream-Status: Inappropriate [debian patch]
|
||||
|
||||
From 6614b8efc5a8d90a26a2b99308b909ac351b65e5 Mon Sep 17 00:00:00 2001
|
||||
From: Rob Browning <rlb@defaultvalue.org>
|
||||
Date: Sat, 23 Apr 2011 14:57:50 -0500
|
||||
Subject: Define _GNU_SOURCE to fix the GNU/kFreeBSD build.
|
||||
|
||||
Author: Petr Salinger <Petr.Salinger@seznam.cz>
|
||||
Closes: #401168
|
||||
---
|
||||
libguile/fports.c | 1 +
|
||||
1 files changed, 1 insertions(+), 0 deletions(-)
|
||||
|
||||
diff --git a/libguile/fports.c b/libguile/fports.c
|
||||
index 1348b8b..3ac3ced 100644
|
||||
--- a/libguile/fports.c
|
||||
+++ b/libguile/fports.c
|
||||
@@ -20,6 +20,7 @@
|
||||
|
||||
|
||||
#define _LARGEFILE64_SOURCE /* ask for stat64 etc */
|
||||
+#define _GNU_SOURCE /* ask for LONG_LONG_MAX/LONG_LONG_MIN */
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
# include <config.h>
|
||||
+26
@@ -0,0 +1,26 @@
|
||||
Upstream-Status: Inappropriate [debian patch]
|
||||
|
||||
From 0c91fa9270e86b20bfb8e62db5ac84617b2567d9 Mon Sep 17 00:00:00 2001
|
||||
From: Rob Browning <rlb@defaultvalue.org>
|
||||
Date: Thu, 10 Nov 2011 02:23:04 -0600
|
||||
Subject: Include gc.h rather than gc/gc_version.h in pthread test.
|
||||
|
||||
See comments in recent gc_version.h. It should never be included
|
||||
directly, and doing so was causing build failures.
|
||||
---
|
||||
.../standalone/test-pthread-create-secondary.c | 2 +-
|
||||
1 files changed, 1 insertions(+), 1 deletions(-)
|
||||
|
||||
diff --git a/test-suite/standalone/test-pthread-create-secondary.c b/test-suite/standalone/test-pthread-create-secondary.c
|
||||
index fe39c2a..d87fb33 100644
|
||||
--- a/test-suite/standalone/test-pthread-create-secondary.c
|
||||
+++ b/test-suite/standalone/test-pthread-create-secondary.c
|
||||
@@ -27,7 +27,7 @@
|
||||
#include <stdlib.h>
|
||||
#include <libguile.h>
|
||||
|
||||
-#include <gc/gc_version.h>
|
||||
+#include <gc.h>
|
||||
|
||||
|
||||
/* Up to GC 7.2alpha5, calling `GC_INIT' from a secondary thread would
|
||||
@@ -0,0 +1,38 @@
|
||||
|
||||
Upstream-Status: Inappropriate [opensuse patch]
|
||||
|
||||
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,
|
||||
@@ -0,0 +1,48 @@
|
||||
|
||||
Upstream-Status: Inappropriate [opensuse patch]
|
||||
|
||||
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))))
|
||||
@@ -0,0 +1,79 @@
|
||||
SUMMARY = "Guile is the GNU Ubiquitous Intelligent Language for Extensions."
|
||||
DESCRIPTION = "Guile is the GNU Ubiquitous Intelligent Language for Extensions,\
|
||||
the official extension language for the GNU operating system.\
|
||||
Guile is a library designed to help programmers create flexible applications.\
|
||||
Using Guile in an application allows the application's functionality to be\
|
||||
extended by users or other programmers with plug-ins, modules, or scripts.\
|
||||
Guile provides what might be described as "practical software freedom,"\
|
||||
making it possible for users to customize an application to meet their\
|
||||
needs without digging into the application's internals."
|
||||
|
||||
HOMEPAGE = "http://www.gnu.org/software/guile/"
|
||||
SECTION = "devel"
|
||||
LICENSE = "GPLv3"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
|
||||
|
||||
SRC_URI = "${GNU_MIRROR}/guile/guile-${PV}.tar.gz \
|
||||
file://debian/0001-Fix-the-SRFI-60-copy-bit-documentation.patch \
|
||||
file://debian/0002-Define-_GNU_SOURCE-to-fix-the-GNU-kFreeBSD-build.patch \
|
||||
file://debian/0003-Include-gc.h-rather-than-gc-gc_version.h-in-pthread-.patch \
|
||||
file://opensuse/guile-64bit.patch \
|
||||
file://opensuse/guile-turn-off-gc-test.patch \
|
||||
"
|
||||
|
||||
SRC_URI[md5sum] = "3b8b4e1083037f29d2c4704a6d55f2a8"
|
||||
SRC_URI[sha256sum] = "a53b21159befe3e89bbaca71e9e62cf00af0f49fcca297c407944b988d59eb08"
|
||||
|
||||
PR = "r1"
|
||||
|
||||
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', 1) != 'guile']}"
|
||||
|
||||
do_configure_prepend() {
|
||||
mkdir -p po
|
||||
}
|
||||
|
||||
export GUILE_FOR_BUILD=${BUILD_SYS}-guile
|
||||
|
||||
do_compile_append() {
|
||||
# just for target recipe
|
||||
if [ "${PN}" == "guile" ]
|
||||
then
|
||||
sed -i -e s:${STAGING_DIR_TARGET}::g \
|
||||
-e s:/${TARGET_SYS}::g \
|
||||
-e s:-L/usr/lib::g \
|
||||
-e s:-isystem/usr/include::g \
|
||||
-e s:,/usr/lib:,\$\{libdir\}:g \
|
||||
meta/guile-2.0.pc
|
||||
fi
|
||||
}
|
||||
|
||||
do_install_append_virtclass-native() {
|
||||
install -m 0755 ${D}${bindir}/guile ${D}${bindir}/${HOST_SYS}-guile
|
||||
}
|
||||
|
||||
SYSROOT_PREPROCESS_FUNCS = "guile_cross_config"
|
||||
|
||||
guile_cross_config() {
|
||||
# this is only for target recipe
|
||||
if [ "${PN}" == "guile" ]
|
||||
then
|
||||
# Create guile-config returning target values instead of native values
|
||||
install -d ${SYSROOT_DESTDIR}${STAGING_BINDIR_CROSS}
|
||||
echo '#!'`which ${BUILD_SYS}-guile`$' \\\n--no-auto-compile -e main -s\n!#\n(define %guile-build-info '\'\( \
|
||||
> guile-config.cross
|
||||
sed -n -e 's:^[ \t]*{[ \t]*": (:' \
|
||||
-e 's:",[ \t]*": . ":' \
|
||||
-e 's:" *}, *\\:"):' \
|
||||
-e 's:^.*cachedir.*$::' \
|
||||
-e '/^ (/p' \
|
||||
< libguile/libpath.h >> guile-config.cross
|
||||
echo '))' >> guile-config.cross
|
||||
cat meta/guile-config >> guile-config.cross
|
||||
install guile-config.cross ${STAGING_BINDIR_CROSS}/guile-config
|
||||
fi
|
||||
}
|
||||
Reference in New Issue
Block a user