| Submitter | Richard Purdie |
|---|---|
| Date | April 2, 2012, 3:45 a.m. |
| Message ID | <1333338343.647.8.camel@ted> |
| Download | mbox | patch |
| Permalink | /patch/25059/ |
| State | New |
| Headers | show |
Comments
On Monday 02 April 2012 04:45:43 Richard Purdie wrote: > diff --git a/meta/recipes-core/gettext/gettext_0.18.1.1.bb > b/meta/recipes-core/gettext/gettext_0.18.1.1.bb index 4144d2b..0ed5dd9 > 100644 > --- a/meta/recipes-core/gettext/gettext_0.18.1.1.bb > +++ b/meta/recipes-core/gettext/gettext_0.18.1.1.bb > @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = > "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" > > PR = "r10" > DEPENDS = "libxml2-native gettext-native virtual/libiconv ncurses expat" > -DEPENDS_virtclass-native = "libxml2-native" > +DEPENDS_virtclass-native = "libxml2-native gettext-minimal-native" > PROVIDES = "virtual/libintl virtual/gettext" > PROVIDES_virtclass-native = "virtual/gettext-native" > CONFLICTS_${PN} = "proxy-libintl" > @@ -95,4 +95,8 @@ do_install_append() { > rm -f ${D}${libdir}/preloadable_libintl.so > } > > +do_install_append_virtclass-native () { > + rm ${D}${datadir}/aclocal/* > +} > + > BBCLASSEXTEND = "native nativesdk" > > although I'm travelling at the moment and have not tested this yet. I've tested this just now and it does fix the problem. The only thing missing is a PR bump. Cheers, Paul
On Mon, 2012-04-02 at 10:02 +0100, Paul Eggleton wrote: > On Monday 02 April 2012 04:45:43 Richard Purdie wrote: > > diff --git a/meta/recipes-core/gettext/gettext_0.18.1.1.bb > > b/meta/recipes-core/gettext/gettext_0.18.1.1.bb index 4144d2b..0ed5dd9 > > 100644 > > --- a/meta/recipes-core/gettext/gettext_0.18.1.1.bb > > +++ b/meta/recipes-core/gettext/gettext_0.18.1.1.bb > > @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = > > "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" > > > > PR = "r10" > > DEPENDS = "libxml2-native gettext-native virtual/libiconv ncurses expat" > > -DEPENDS_virtclass-native = "libxml2-native" > > +DEPENDS_virtclass-native = "libxml2-native gettext-minimal-native" > > PROVIDES = "virtual/libintl virtual/gettext" > > PROVIDES_virtclass-native = "virtual/gettext-native" > > CONFLICTS_${PN} = "proxy-libintl" > > @@ -95,4 +95,8 @@ do_install_append() { > > rm -f ${D}${libdir}/preloadable_libintl.so > > } > > > > +do_install_append_virtclass-native () { > > + rm ${D}${datadir}/aclocal/* > > +} > > + > > BBCLASSEXTEND = "native nativesdk" > > > > although I'm travelling at the moment and have not tested this yet. > > I've tested this just now and it does fix the problem. The only thing missing > is a PR bump. Thanks for testing. I've gone ahead and merged this into master with a PR bump added for both gettext and gettext-minimal-native to ensure sysroots are corrected. Cheers, Richard
Patch
diff --git a/meta/recipes-core/gettext/gettext_0.18.1.1.bb b/meta/recipes-core/gettext/gettext_0.18.1.1.bb index 4144d2b..0ed5dd9 100644 --- a/meta/recipes-core/gettext/gettext_0.18.1.1.bb +++ b/meta/recipes-core/gettext/gettext_0.18.1.1.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" PR = "r10" DEPENDS = "libxml2-native gettext-native virtual/libiconv ncurses expat" -DEPENDS_virtclass-native = "libxml2-native" +DEPENDS_virtclass-native = "libxml2-native gettext-minimal-native" PROVIDES = "virtual/libintl virtual/gettext" PROVIDES_virtclass-native = "virtual/gettext-native" CONFLICTS_${PN} = "proxy-libintl" @@ -95,4 +95,8 @@ do_install_append() { rm -f ${D}${libdir}/preloadable_libintl.so } +do_install_append_virtclass-native () { + rm ${D}${datadir}/aclocal/* +} + BBCLASSEXTEND = "native nativesdk"