| Submitter | Khem Raj |
|---|---|
| Date | Aug. 10, 2011, 3:15 a.m. |
| Message ID | <1312946123-2982-1-git-send-email-raj.khem@gmail.com> |
| Download | mbox | patch |
| Permalink | /patch/9575/ |
| State | New, archived |
| Headers | show |
Comments
On Tue, 2011-08-09 at 20:15 -0700, Khem Raj wrote: > +-AC_PATH_PROG(INTLTOOL_PERL, perl) > ++AC_PATH_PROG(INTLTOOL_PERL, nativeperl) I don't think you want to do that for the copy of intltool.m4 that's going to be installed on the target, only for the one that goes into the sysroot. p.
-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 On 08/10/2011 04:30 AM, Phil Blundell wrote: > On Tue, 2011-08-09 at 20:15 -0700, Khem Raj wrote: >> +-AC_PATH_PROG(INTLTOOL_PERL, perl) ++AC_PATH_PROG(INTLTOOL_PERL, >> nativeperl) > > I don't think you want to do that for the copy of intltool.m4 that's > going to be installed on the target, only for the one that goes into > the sysroot. > ah right. I will resubmit > p. > > > > _______________________________________________ Openembedded-core > mailing list Openembedded-core@lists.openembedded.org > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core - -- > - -Khem -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) iEYEARECAAYFAk5CnNMACgkQuwUzVZGdMxQbOQCeJZRkN32WN9yG6tTOEBiJhTSt eZgAnRutQ6EPya3rYnOjZvcQoESw1vwx =zH1y -----END PGP SIGNATURE-----
On Wed, 2011-08-10 at 07:59 -0700, Khem Raj wrote: > On 08/10/2011 04:30 AM, Phil Blundell wrote: > > On Tue, 2011-08-09 at 20:15 -0700, Khem Raj wrote: > >> +-AC_PATH_PROG(INTLTOOL_PERL, perl) ++AC_PATH_PROG(INTLTOOL_PERL, > >> nativeperl) > > > > I don't think you want to do that for the copy of intltool.m4 that's > > going to be installed on the target, only for the one that goes into > > the sysroot. > > > > ah right. I will resubmit It turns out there are various other things wrong with the installed intltool as well (not caused by your patch). The copy of intltool-extract that goes into the rootfs starts with: #!/home/pb/oe/build-epia/tmp-eglibc/sysroots/x86_64-linux/bin/perl-native/perl # -*- Mode: perl; indent-tabs-mode: nil; c-basic-offset: 4 -*- which is clearly no good, and the intltool package which contains this script doesn't Depend on perl. Also, the output package is Architecture: i586 when I think it should probably be all. Also the intltool.m4 file is getting shipped in intltool-dev but I think it should probably be in intltool. p.
Patch
diff --git a/meta/recipes-devtools/intltool/intltool-0.40.6/use-nativeperl.patch b/meta/recipes-devtools/intltool/intltool-0.40.6/use-nativeperl.patch new file mode 100644 index 0000000..5f5fed3 --- /dev/null +++ b/meta/recipes-devtools/intltool/intltool-0.40.6/use-nativeperl.patch @@ -0,0 +1,20 @@ +OE has perl binary as 'nativeperl' in native sysroot so we look for it +in order to avoid intltool searching and finding perl from /usr/bin +on build system which may not have all the modules that it needs. + +Signed-off-by: Khem Raj <raj.khem@gmail.com> + +Upstream-Status: Inappropriate [OE specific] +Index: intltool-0.40.6/intltool.m4 +=================================================================== +--- intltool-0.40.6.orig/intltool.m4 2009-02-14 14:12:28.000000000 -0800 ++++ intltool-0.40.6/intltool.m4 2011-08-09 08:07:16.427347846 -0700 +@@ -110,7 +110,7 @@ + AC_MSG_ERROR([GNU gettext tools not found; required for intltool]) + fi + +-AC_PATH_PROG(INTLTOOL_PERL, perl) ++AC_PATH_PROG(INTLTOOL_PERL, nativeperl) + if test -z "$INTLTOOL_PERL"; then + AC_MSG_ERROR([perl not found]) + fi diff --git a/meta/recipes-devtools/intltool/intltool.inc b/meta/recipes-devtools/intltool/intltool.inc index 1e778b6..7e11fc9 100644 --- a/meta/recipes-devtools/intltool/intltool.inc +++ b/meta/recipes-devtools/intltool/intltool.inc @@ -1,6 +1,6 @@ DESCRIPTION = "Utility scripts for internationalizing XML" SECTION = "devel" -LICENSE = "GPL" +LICENSE = "GPLv2" URLV="${@'.'.join(bb.data.getVar('PV',d,1).split('.')[0:2])}" SRC_URI = "${GNOME_MIRROR}/intltool/${URLV}/intltool-${PV}.tar.bz2" @@ -13,5 +13,4 @@ RRECOMMENDS_${PN}_virtclass-native = "" inherit autotools pkgconfig perlnative -export PERL_virtclass-native = "/usr/bin/env perl" BBCLASSEXTEND = "native" diff --git a/meta/recipes-devtools/intltool/intltool_0.40.6.bb b/meta/recipes-devtools/intltool/intltool_0.40.6.bb index c7938e5..40672a9 100644 --- a/meta/recipes-devtools/intltool/intltool_0.40.6.bb +++ b/meta/recipes-devtools/intltool/intltool_0.40.6.bb @@ -1,9 +1,11 @@ require intltool.inc LICENSE="GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" -PR = "r3" +PR = "r4" -SRC_URI_append = " file://intltool-nowarn-0.40.0.patch" +SRC_URI_append = " file://intltool-nowarn-0.40.0.patch \ + file://use-nativeperl.patch \ + " SRC_URI[md5sum] = "69bc0353323112f42ad4f9cf351bc3e5" SRC_URI[sha256sum] = "4d1e5f8561f09c958e303d4faa885079a5e173a61d28437d0013ff5efc9e3b64"
License is GPLv2 change it. Defining PERL for native intltool is not needed anymore Signed-off-by: Khem Raj <raj.khem@gmail.com> --- .../intltool/intltool-0.40.6/use-nativeperl.patch | 20 ++++++++++++++++++++ meta/recipes-devtools/intltool/intltool.inc | 3 +-- meta/recipes-devtools/intltool/intltool_0.40.6.bb | 6 ++++-- 3 files changed, 25 insertions(+), 4 deletions(-) create mode 100644 meta/recipes-devtools/intltool/intltool-0.40.6/use-nativeperl.patch