Patchwork [v3] guile: added runtime dependency on glibc-gconv-iso8859-1

login
register
mail settings
Submitter Bogdan Marinescu
Date May 29, 2013, 1:40 p.m.
Message ID <1369834810-18927-1-git-send-email-bogdan.a.marinescu@intel.com>
Download mbox | patch
Permalink /patch/50689/
State New
Headers show

Comments

Bogdan Marinescu - May 29, 2013, 1:40 p.m.
guile needs to be able to convert strings from ISO-8859-1 in order
to work properly. This patch adds a runtime dependency to the required
convert package, but only when glibc is used. The fix for uClibc depends
on another bug (#4530).

[YOCTO #4019]

Signed-off-by: Bogdan Marinescu <bogdan.a.marinescu@intel.com>
---
 meta/recipes-devtools/guile/guile_2.0.9.bb |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
Paul Eggleton - May 30, 2013, 1:52 p.m.
On Wednesday 29 May 2013 16:40:10 Bogdan Marinescu wrote:
> guile needs to be able to convert strings from ISO-8859-1 in order
> to work properly. This patch adds a runtime dependency to the required
> convert package, but only when glibc is used. The fix for uClibc depends
> on another bug (#4530).
> 
> [YOCTO #4019]
> 
> Signed-off-by: Bogdan Marinescu <bogdan.a.marinescu@intel.com>
> ---
>  meta/recipes-devtools/guile/guile_2.0.9.bb |    5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/meta/recipes-devtools/guile/guile_2.0.9.bb
> b/meta/recipes-devtools/guile/guile_2.0.9.bb index 617f7ce..8ba7afc 100644
> --- a/meta/recipes-devtools/guile/guile_2.0.9.bb
> +++ b/meta/recipes-devtools/guile/guile_2.0.9.bb
> @@ -27,7 +27,7 @@ SRC_URI = "${GNU_MIRROR}/guile/guile-${PV}.tar.xz \
>  SRC_URI[md5sum] = "a69b575d4a633bdd9118f3a4a1e97766"
>  SRC_URI[sha256sum] =
> "f70a38c8d9751f442679bfe61852bba8545af4d4355d037630997c2f37f2895b"
> 
> -PR = "r0"
> +PR = "r1"
> 
>  inherit autotools gettext
>  BBCLASSEXTEND = "native"
> @@ -36,6 +36,9 @@ 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']}"
> 
> +RDEPENDS_${PN}_append_libc-glibc_class-target = "glibc-gconv-iso8859-1"
> +RDEPENDS_${PN}_class-native = ""

The second line is erroneous, surely we only need the first to solve this 
issue?

Cheers,
Paul
Richard Purdie - May 30, 2013, 8:01 p.m.
On Thu, 2013-05-30 at 14:52 +0100, Paul Eggleton wrote:
> On Wednesday 29 May 2013 16:40:10 Bogdan Marinescu wrote:
> > guile needs to be able to convert strings from ISO-8859-1 in order
> > to work properly. This patch adds a runtime dependency to the required
> > convert package, but only when glibc is used. The fix for uClibc depends
> > on another bug (#4530).
> > 
> > [YOCTO #4019]
> > 
> > Signed-off-by: Bogdan Marinescu <bogdan.a.marinescu@intel.com>
> > ---
> >  meta/recipes-devtools/guile/guile_2.0.9.bb |    5 ++++-
> >  1 file changed, 4 insertions(+), 1 deletion(-)
> > 
> > diff --git a/meta/recipes-devtools/guile/guile_2.0.9.bb
> > b/meta/recipes-devtools/guile/guile_2.0.9.bb index 617f7ce..8ba7afc 100644
> > --- a/meta/recipes-devtools/guile/guile_2.0.9.bb
> > +++ b/meta/recipes-devtools/guile/guile_2.0.9.bb
> > @@ -27,7 +27,7 @@ SRC_URI = "${GNU_MIRROR}/guile/guile-${PV}.tar.xz \
> >  SRC_URI[md5sum] = "a69b575d4a633bdd9118f3a4a1e97766"
> >  SRC_URI[sha256sum] =
> > "f70a38c8d9751f442679bfe61852bba8545af4d4355d037630997c2f37f2895b"
> > 
> > -PR = "r0"
> > +PR = "r1"
> > 
> >  inherit autotools gettext
> >  BBCLASSEXTEND = "native"
> > @@ -36,6 +36,9 @@ 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']}"
> > 
> > +RDEPENDS_${PN}_append_libc-glibc_class-target = "glibc-gconv-iso8859-1"
> > +RDEPENDS_${PN}_class-native = ""
> 
> The second line is erroneous, surely we only need the first to solve this 
> issue?

I merged this with the second line removed since it isn't needed afaict.

Cheers,

Richard

Patch

diff --git a/meta/recipes-devtools/guile/guile_2.0.9.bb b/meta/recipes-devtools/guile/guile_2.0.9.bb
index 617f7ce..8ba7afc 100644
--- a/meta/recipes-devtools/guile/guile_2.0.9.bb
+++ b/meta/recipes-devtools/guile/guile_2.0.9.bb
@@ -27,7 +27,7 @@  SRC_URI = "${GNU_MIRROR}/guile/guile-${PV}.tar.xz \
 SRC_URI[md5sum] = "a69b575d4a633bdd9118f3a4a1e97766"
 SRC_URI[sha256sum] = "f70a38c8d9751f442679bfe61852bba8545af4d4355d037630997c2f37f2895b"
 
-PR = "r0"
+PR = "r1"
 
 inherit autotools gettext
 BBCLASSEXTEND = "native"
@@ -36,6 +36,9 @@  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']}"
 
+RDEPENDS_${PN}_append_libc-glibc_class-target = "glibc-gconv-iso8859-1"
+RDEPENDS_${PN}_class-native = ""
+
 EXTRA_OECONF += "${@['--without-libltdl-prefix --without-libgmp-prefix', ''][bb.data.inherits_class('native',d)]}"
 
 do_configure_prepend() {