[gnome-continuous-yocto/gnomeostree-3.28-rocko: 1526/8267] guile: 2.0.11 -> 2.0.12

[Emmanuele Bassi <ebassi src gnome org>]

commit 6d9958ee9da793e4c87853e5c74d264423a68f33
Author: Robert Yang <liezhi yang windriver com>
Date:   Mon Jul 25 01:16:26 2016 -0700

    guile: 2.0.11 -> 2.0.12
    
    * Remove these patches which already in the source:
      - libguile-VM-ASM_MUL-for-ARM-Add-earlyclobber.patch
      - remove_strcase_l_funcs.patch
      - 0001-libguile-Check-for-strtol_l-during-configure.patch
    
    * Update 0002-Recognize-nios2-as-compilation-target.patch
    
    (From OE-Core rev: 42fd94e8168e618b7a45b1261ee5c06bb38548e4)
    
    Signed-off-by: Robert Yang <liezhi yang windriver com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 ...guile-Check-for-strtol_l-during-configure.patch |   56 --------------------
 ...002-Recognize-nios2-as-compilation-target.patch |   20 +++----
 ...guile-VM-ASM_MUL-for-ARM-Add-earlyclobber.patch |   43 ---------------
 .../guile/files/remove_strcase_l_funcs.patch       |   38 -------------
 .../guile/{guile_2.0.11.bb => guile_2.0.12.bb}     |   11 +---
 5 files changed, 10 insertions(+), 158 deletions(-)
---
diff --git a/meta/recipes-devtools/guile/files/0002-Recognize-nios2-as-compilation-target.patch 
b/meta/recipes-devtools/guile/files/0002-Recognize-nios2-as-compilation-target.patch
index 519585b..8e84747 100644
--- a/meta/recipes-devtools/guile/files/0002-Recognize-nios2-as-compilation-target.patch
+++ b/meta/recipes-devtools/guile/files/0002-Recognize-nios2-as-compilation-target.patch
@@ -10,27 +10,23 @@ Upstream-Status: Submitted [ http://debbugs.gnu.org/cgi/bugreport.cgi?bug=22480
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/module/system/base/target.scm b/module/system/base/target.scm
-index d60a8e0..d1f6cff 100644
 --- a/module/system/base/target.scm
 +++ b/module/system/base/target.scm
 @@ -65,7 +65,7 @@
        (cond ((string-match "^i[0-9]86$" cpu)
               (endianness little))
              ((member cpu '("x86_64" "ia64"
--                           "powerpcle" "powerpc64le" "mipsel" "mips64el"))
-+                           "powerpcle" "powerpc64le" "mipsel" "mips64el" "nios2"))
+-                           "powerpcle" "powerpc64le" "mipsel" "mips64el" "sh4"))
++                           "powerpcle" "powerpc64le" "mipsel" "mips64el" "sh4" "nios2"))
               (endianness little))
              ((member cpu '("sparc" "sparc64" "powerpc" "powerpc64" "spu"
-                            "mips" "mips64"))
-@@ -100,7 +100,7 @@
+                            "mips" "mips64" "m68k" "s390x"))
+@@ -108,7 +108,7 @@
  
            ((string-match "64$" cpu) 8)
-           ((string-match "64[lbe][lbe]$" cpu) 8)
--          ((member cpu '("sparc" "powerpc" "mips" "mipsel")) 4)
-+          ((member cpu '("sparc" "powerpc" "mips" "mipsel" "nios2")) 4)
+           ((string-match "64_?[lbe][lbe]$" cpu) 8)
+-          ((member cpu '("sparc" "powerpc" "mips" "mipsel" "m68k" "sh4")) 4)
++          ((member cpu '("sparc" "powerpc" "mips" "mipsel" "m68k" "sh4" "nios2")) 4)
+           ((member cpu '("s390x")) 8)
            ((string-match "^arm.*" cpu) 4)
            (else (error "unknown CPU word size" cpu)))))
- 
--- 
-2.7.0.rc3
-
diff --git a/meta/recipes-devtools/guile/guile_2.0.11.bb b/meta/recipes-devtools/guile/guile_2.0.12.bb
similarity index 91%
rename from meta/recipes-devtools/guile/guile_2.0.11.bb
rename to meta/recipes-devtools/guile/guile_2.0.12.bb
index 6cefe66..d2fe511 100644
--- a/meta/recipes-devtools/guile/guile_2.0.11.bb
+++ b/meta/recipes-devtools/guile/guile_2.0.12.bb
@@ -22,18 +22,11 @@ SRC_URI = "${GNU_MIRROR}/guile/guile-${PV}.tar.xz \
            file://arm_aarch64.patch \
            file://workaround-ice-ssa-corruption.patch \
            file://libguile-Makefile.am-hook.patch \
-           file://libguile-VM-ASM_MUL-for-ARM-Add-earlyclobber.patch \
-           file://remove_strcase_l_funcs.patch \
-           file://0001-libguile-Check-for-strtol_l-during-configure.patch \
            file://0002-Recognize-nios2-as-compilation-target.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"
-
+SRC_URI[md5sum] = "081fdf80cd3a76f260a2a0d87f773d6b"
+SRC_URI[sha256sum] = "de8187736f9b260f2fa776ed39b52cb74dd389ccf7039c042f0606270196b7e9"
 
 inherit autotools gettext pkgconfig texinfo
 BBCLASSEXTEND = "native"