guile: fix licensing and gettext inherit

Reported by Philip Balister

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>

4 files changed, 6 insertions, 4 deletions

diff --git a/meta-oe/recipes-support/guile/guile-native.inc b/meta-oe/recipes-support/guile/guile-native.inc
index 20ff5415c3..dfa126af04 100644
--- a/meta-oe/recipes-support/guile/guile-native.inc
+++ b/meta-oe/recipes-support/guile/guile-native.inc
@@ -2,7 +2,6 @@ SECTION = "unknown"
 DEPENDS = "gettext-native gmp-native"
 
 LICENSE = "LGPLv2.1"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=c9ba0d76ca3ef2a1d15a2ac839ef01fa"
 
 inherit autotools native
 
diff --git a/meta-oe/recipes-support/guile/guile-native_1.8.7.bb b/meta-oe/recipes-support/guile/guile-native_1.8.7.bb
index f8fd4c7b71..2b2707abe3 100644
--- a/meta-oe/recipes-support/guile/guile-native_1.8.7.bb
+++ b/meta-oe/recipes-support/guile/guile-native_1.8.7.bb
@@ -1,5 +1,7 @@
 require guile-native.inc
 
+LIC_FILES_CHKSUM = "file://LICENSE;md5=c9ba0d76ca3ef2a1d15a2ac839ef01fa"
+
 PR = "r1"
 SRC_URI = "http://ftp.gnu.org/pub/gnu/guile/guile-${PV}.tar.gz \
            file://configure-fix.patch \
diff --git a/meta-oe/recipes-support/guile/guile.inc b/meta-oe/recipes-support/guile/guile.inc
index 918ce33bf2..842e8d7ebf 100644
--- a/meta-oe/recipes-support/guile/guile.inc
+++ b/meta-oe/recipes-support/guile/guile.inc
@@ -7,10 +7,9 @@ PACKAGES =+ "${PN}-el"
 FILES_${PN}-el = "${datadir}/emacs"
 DESCRIPTION_${PN}-el = "Emacs lisp files for Guile"
 
-LICENSE = "LGPLv2.1"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=c9ba0d76ca3ef2a1d15a2ac839ef01fa"
+LICENSE = "LGPLv2.1+"
 
-inherit autotools
+inherit autotools gettext
 
 acpaths = "-I ${S}/guile-config"
 
diff --git a/meta-oe/recipes-support/guile/guile_1.8.7.bb b/meta-oe/recipes-support/guile/guile_1.8.7.bb
index 8b3a80d91d..d02fe42e57 100644
--- a/meta-oe/recipes-support/guile/guile_1.8.7.bb
+++ b/meta-oe/recipes-support/guile/guile_1.8.7.bb
@@ -1,5 +1,7 @@
 require guile.inc
 
+LIC_FILES_CHKSUM = "file://LICENSE;md5=5711ae313ffd140741e741b88d9d4007"
+
 PR = "r1"
 
 SRC_URI = "http://ftp.gnu.org/pub/gnu/guile/guile-${PV}.tar.gz \