From 3d03eb7430849d7bd709e70a300efeb4a88cdb20 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Fri, 14 Dec 2012 13:43:36 +0200 Subject: guile: update to upstream version 2.0.7 change-install-data-hook-to-install-exec-hook-in-gui.patch is now part of upstream. Signed-off-by: Marko Lindqvist Signed-off-by: Saul Wold --- ...all-data-hook-to-install-exec-hook-in-gui.patch | 36 ------- meta/recipes-devtools/guile/guile_2.0.6.bb | 103 --------------------- meta/recipes-devtools/guile/guile_2.0.7.bb | 102 ++++++++++++++++++++ 3 files changed, 102 insertions(+), 139 deletions(-) delete mode 100644 meta/recipes-devtools/guile/files/change-install-data-hook-to-install-exec-hook-in-gui.patch delete mode 100644 meta/recipes-devtools/guile/guile_2.0.6.bb create mode 100644 meta/recipes-devtools/guile/guile_2.0.7.bb (limited to 'meta/recipes-devtools/guile') diff --git a/meta/recipes-devtools/guile/files/change-install-data-hook-to-install-exec-hook-in-gui.patch b/meta/recipes-devtools/guile/files/change-install-data-hook-to-install-exec-hook-in-gui.patch deleted file mode 100644 index df61e5d104..0000000000 --- a/meta/recipes-devtools/guile/files/change-install-data-hook-to-install-exec-hook-in-gui.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 687e5a6598f89b97c89afb94d6ac3ec024dc08e2 Mon Sep 17 00:00:00 2001 -From: "Song.Li" -Date: Thu, 26 Jul 2012 14:19:46 +0800 -Subject: [PATCH] guile:meta/Makefile change install-data-hook to install-exec-hook - -In guile meta/Makefile, what install-data-hook do -must be run after install-binSCRIPTS.so it's a exec hook, not a data hook. -If keep these exec-hook in data-hook,when we run make with multi-jobbing , -install-data-hook and install-binSCRIPTS will be separately -processed in different thread, no any dependence. -that will cause error sometimes. - -[YOCTO #2796] - -Upstream-Status:Submitted -Upstream Bugid :12015 email:12015@debbugs.gnu.org -guile bug maillist: bug-guile@gnu.org - -Signed-off-by: Song.Li ---- - meta/Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/meta/Makefile.am b/meta/Makefile.am -index a05730d..bd20784 100644 ---- a/meta/Makefile.am -+++ b/meta/Makefile.am -@@ -28,7 +28,7 @@ EXTRA_DIST= \ - guild.in guile-config.in - - # What we now call `guild' used to be known as `guile-tools'. --install-data-hook: -+install-exec-hook: - guild="`echo $(ECHO_N) guild \ - | $(SED) -e '$(program_transform_name)'`$(EXEEXT)" ; \ - guile_tools="`echo $(ECHO_N) guile-tools \ diff --git a/meta/recipes-devtools/guile/guile_2.0.6.bb b/meta/recipes-devtools/guile/guile_2.0.6.bb deleted file mode 100644 index 45603e6eda..0000000000 --- a/meta/recipes-devtools/guile/guile_2.0.6.bb +++ /dev/null @@ -1,103 +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.gz \ - 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://change-install-data-hook-to-install-exec-hook-in-gui.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] = "3438cd4415c0c43ca93a20e845eba7e2" -SRC_URI[sha256sum] = "3ece055145a5020dd36b84f5fbccd4b3846a671960dd5ee55931555f03200950" - -PR = "r2" - -inherit autotools gettext -BBCLASSEXTEND = "native" - -DEPENDS = "libunistring bdwgc gmp libtool libffi" -# add guile-native only to the target recipe's DEPENDS -DEPENDS += "${@['guile-native libatomics-ops', ''][d.getVar('PN', True) != 'guile']}" - -EXTRA_OECONF += "${@['--without-libltdl-prefix --without-libgmp-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.7.bb b/meta/recipes-devtools/guile/guile_2.0.7.bb new file mode 100644 index 0000000000..7f3316a893 --- /dev/null +++ b/meta/recipes-devtools/guile/guile_2.0.7.bb @@ -0,0 +1,102 @@ +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] = "30ff9e94663a2e2098b52f8ce9d050b9" +SRC_URI[sha256sum] = "6f278fa699685382ae51ba8bfad5840959e0af6414f3ad803d61131567bfa338" + +PR = "r0" + +inherit autotools gettext +BBCLASSEXTEND = "native" + +DEPENDS = "libunistring bdwgc gmp libtool libffi" +# add guile-native only to the target recipe's DEPENDS +DEPENDS += "${@['guile-native libatomics-ops', ''][d.getVar('PN', True) != 'guile']}" + +EXTRA_OECONF += "${@['--without-libltdl-prefix --without-libgmp-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