From f1727bb18f35ff01e53d3d442a6ff3c613639fa6 Mon Sep 17 00:00:00 2001 From: Chong Lu Date: Tue, 20 May 2014 09:28:26 +0800 Subject: guile: Update to 2.0.11 version Upgrade guile to 2.0.11 version and remove unneeded patch since it's included in new version. Signed-off-by: Chong Lu Signed-off-by: Saul Wold --- .../guile/files/guile_2.0.9_fix_noreturn.patch | 65 ------------- meta/recipes-devtools/guile/guile_2.0.11.bb | 103 ++++++++++++++++++++ meta/recipes-devtools/guile/guile_2.0.9.bb | 104 --------------------- 3 files changed, 103 insertions(+), 169 deletions(-) delete mode 100644 meta/recipes-devtools/guile/files/guile_2.0.9_fix_noreturn.patch create mode 100644 meta/recipes-devtools/guile/guile_2.0.11.bb delete mode 100644 meta/recipes-devtools/guile/guile_2.0.9.bb 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 deleted file mode 100644 index 3f65dce72c..0000000000 --- a/meta/recipes-devtools/guile/files/guile_2.0.9_fix_noreturn.patch +++ /dev/null @@ -1,65 +0,0 @@ -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/guile_2.0.11.bb b/meta/recipes-devtools/guile/guile_2.0.11.bb new file mode 100644 index 0000000000..c597111826 --- /dev/null +++ b/meta/recipes-devtools/guile/guile_2.0.11.bb @@ -0,0 +1,103 @@ +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.xz \ + file://debian/0002-Mark-Unused-modules-are-removed-gc-test-as-unresolve.patch \ + file://debian/0003-Mark-mutex-with-owner-not-retained-threads-test-as-u.patch \ + file://opensuse/guile-64bit.patch \ + file://guile_2.0.6_fix_sed_error.patch \ + file://arm_endianness.patch \ + " + +# file://debian/0001-Change-guile-to-guile-X.Y-for-info-pages.patch +# file://opensuse/guile-turn-off-gc-test.patch + +SRC_URI[md5sum] = "03f1bce1a4983076d955003472306a13" +SRC_URI[sha256sum] = "aed0a4a6db4e310cbdfeb3613fa6f86fddc91ef624c1e3f8937a6304c69103e2" + + +inherit autotools gettext texinfo +BBCLASSEXTEND = "native" + +DEPENDS = "libunistring bdwgc gmp libtool libffi" +# add guile-native only to the target recipe's DEPENDS +DEPENDS_append_class-target = " guile-native libatomics-ops" + +RDEPENDS_${PN}_append_libc-glibc_class-target = "glibc-gconv-iso8859-1" + +EXTRA_OECONF += "${@['--without-libltdl-prefix --without-libgmp-prefix --without-libreadline-prefix', ''][bb.data.inherits_class('native',d)]}" + +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_class-native() { + install -m 0755 ${D}${bindir}/guile ${D}${bindir}/${HOST_SYS}-guile + + create_wrapper ${D}/${bindir}/guile \ + GUILE_LOAD_PATH=${STAGING_DATADIR_NATIVE}/guile/2.0 \ + GUILE_LOAD_COMPILED_PATH=${STAGING_LIBDIR_NATIVE}/guile/2.0/ccache + create_wrapper ${D}${bindir}/${HOST_SYS}-guile \ + GUILE_LOAD_PATH=${STAGING_DATADIR_NATIVE}/guile/2.0 \ + GUILE_LOAD_COMPILED_PATH=${STAGING_LIBDIR_NATIVE}/guile/2.0/ccache +} + +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 +} + +# Guile needs the compiled files to be newer than the source, and it won't +# auto-compile into the prefix even if it can write there, so touch them here as +# sysroot is managed. +SSTATEPOSTINSTFUNCS += "guile_sstate_postinst" +guile_sstate_postinst() { + if [ "${BB_CURRENTTASK}" = "populate_sysroot" -o "${BB_CURRENTTASK}" = "populate_sysroot_setscene" ] + then + find ${STAGING_DIR_TARGET}/${libdir}/guile/2.0/ccache -type f | xargs touch + fi +} diff --git a/meta/recipes-devtools/guile/guile_2.0.9.bb b/meta/recipes-devtools/guile/guile_2.0.9.bb deleted file mode 100644 index b35d54e7d2..0000000000 --- a/meta/recipes-devtools/guile/guile_2.0.9.bb +++ /dev/null @@ -1,104 +0,0 @@ -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.xz \ - file://debian/0002-Mark-Unused-modules-are-removed-gc-test-as-unresolve.patch \ - file://debian/0003-Mark-mutex-with-owner-not-retained-threads-test-as-u.patch \ - file://opensuse/guile-64bit.patch \ - file://guile_2.0.6_fix_sed_error.patch \ - file://arm_endianness.patch \ - file://guile_2.0.9_fix_noreturn.patch \ - " - -# file://debian/0001-Change-guile-to-guile-X.Y-for-info-pages.patch -# file://opensuse/guile-turn-off-gc-test.patch - -SRC_URI[md5sum] = "a69b575d4a633bdd9118f3a4a1e97766" -SRC_URI[sha256sum] = "f70a38c8d9751f442679bfe61852bba8545af4d4355d037630997c2f37f2895b" - - -inherit autotools gettext texinfo -BBCLASSEXTEND = "native" - -DEPENDS = "libunistring bdwgc gmp libtool libffi" -# add guile-native only to the target recipe's DEPENDS -DEPENDS_append_class-target = " guile-native libatomics-ops" - -RDEPENDS_${PN}_append_libc-glibc_class-target = "glibc-gconv-iso8859-1" - -EXTRA_OECONF += "${@['--without-libltdl-prefix --without-libgmp-prefix --without-libreadline-prefix', ''][bb.data.inherits_class('native',d)]}" - -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_class-native() { - install -m 0755 ${D}${bindir}/guile ${D}${bindir}/${HOST_SYS}-guile - - create_wrapper ${D}/${bindir}/guile \ - GUILE_LOAD_PATH=${STAGING_DATADIR_NATIVE}/guile/2.0 \ - GUILE_LOAD_COMPILED_PATH=${STAGING_LIBDIR_NATIVE}/guile/2.0/ccache - create_wrapper ${D}${bindir}/${HOST_SYS}-guile \ - GUILE_LOAD_PATH=${STAGING_DATADIR_NATIVE}/guile/2.0 \ - GUILE_LOAD_COMPILED_PATH=${STAGING_LIBDIR_NATIVE}/guile/2.0/ccache -} - -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 -} - -# Guile needs the compiled files to be newer than the source, and it won't -# auto-compile into the prefix even if it can write there, so touch them here as -# sysroot is managed. -SSTATEPOSTINSTFUNCS += "guile_sstate_postinst" -guile_sstate_postinst() { - if [ "${BB_CURRENTTASK}" = "populate_sysroot" -o "${BB_CURRENTTASK}" = "populate_sysroot_setscene" ] - then - find ${STAGING_DIR_TARGET}/${libdir}/guile/2.0/ccache -type f | xargs touch - fi -} -- cgit 1.2.3-korg