* [PATCH 0/1] Fix for host conamination
@ 2011-11-24 18:29 Saul Wold
2011-11-24 18:29 ` [PATCH 1/1] intltool: remove XML::Parser check Saul Wold
0 siblings, 1 reply; 8+ messages in thread
From: Saul Wold @ 2011-11-24 18:29 UTC (permalink / raw)
To: openembedded-core
This address a problem where a intltool.m4 check will fail if
the host system does not have XML::Parser installed.
The following changes since commit 0a1dedeb8eea4e230b47d1516b3e6e90495fe49d:
libtool: Avoid relinking when cross compiling, its pointless (2011-11-24 00:02:27 +0000)
are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib sgw/fix
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=sgw/fix
Saul Wold (1):
intltool: remove XML::Parser check
.../intltool-0.40.6/remove-xml-check.patch | 29 ++++++++++++++++++++
meta/recipes-devtools/intltool/intltool_0.40.6.bb | 7 +++--
2 files changed, 33 insertions(+), 3 deletions(-)
create mode 100644 meta/recipes-devtools/intltool/intltool-0.40.6/remove-xml-check.patch
--
1.7.5.4
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 1/1] intltool: remove XML::Parser check
2011-11-24 18:29 [PATCH 0/1] Fix for host conamination Saul Wold
@ 2011-11-24 18:29 ` Saul Wold
2011-11-24 19:37 ` Khem Raj
0 siblings, 1 reply; 8+ messages in thread
From: Saul Wold @ 2011-11-24 18:29 UTC (permalink / raw)
To: openembedded-core
Add Patch to disable the XML::Parser check in the target
intltool.m4, this check will find the host (not native)
XML::Parser if it's installed possibly causing Host
contamination, but will also fail configuration if XML::Parser
is not installed on the host.
Since we know that XML::Parser is installed on the image, we don't
really need this check, so comment it out.
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
.../intltool-0.40.6/remove-xml-check.patch | 29 ++++++++++++++++++++
meta/recipes-devtools/intltool/intltool_0.40.6.bb | 7 +++--
2 files changed, 33 insertions(+), 3 deletions(-)
create mode 100644 meta/recipes-devtools/intltool/intltool-0.40.6/remove-xml-check.patch
diff --git a/meta/recipes-devtools/intltool/intltool-0.40.6/remove-xml-check.patch b/meta/recipes-devtools/intltool/intltool-0.40.6/remove-xml-check.patch
new file mode 100644
index 0000000..476d091
--- /dev/null
+++ b/meta/recipes-devtools/intltool/intltool-0.40.6/remove-xml-check.patch
@@ -0,0 +1,29 @@
+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-11-23 15:39:34.689561872 -0800
+@@ -122,14 +122,16 @@
+ IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`"
+ AC_MSG_RESULT([$IT_PERL_VERSION])
+ fi
+-if test "x$2" != "xno-xml"; then
+- AC_MSG_CHECKING([for XML::Parser])
+- if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then
+- AC_MSG_RESULT([ok])
+- else
+- AC_MSG_ERROR([XML::Parser perl module is required for intltool])
+- fi
+-fi
++
++# Disable this check since we know XML::Parser is installed
++#if test "x$2" != "xno-xml"; then
++# AC_MSG_CHECKING([for XML::Parser])
++# if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then
++# AC_MSG_RESULT([ok])
++# else
++# AC_MSG_ERROR([XML::Parser perl module is required for intltool])
++# fi
++#fi
+
+ # Substitute ALL_LINGUAS so we can use it in po/Makefile
+ AC_SUBST(ALL_LINGUAS)
diff --git a/meta/recipes-devtools/intltool/intltool_0.40.6.bb b/meta/recipes-devtools/intltool/intltool_0.40.6.bb
index e9871fc..8180fd8 100644
--- a/meta/recipes-devtools/intltool/intltool_0.40.6.bb
+++ b/meta/recipes-devtools/intltool/intltool_0.40.6.bb
@@ -1,14 +1,15 @@
require intltool.inc
LICENSE="GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
-PR = "r5"
+PR = "r6"
SRC_URI_append = " file://intltool-nowarn-0.40.0.patch \
${NATIVEPATCHES} \
"
-NATIVEPATCHES = "file://noperlcheck.patch"
-NATIVEPATCHES_virtclass-native = "file://use-nativeperl.patch"
+NATIVEPATCHES = "file://noperlcheck.patch \
+ file://remove-xml-check.patch"
+NATIVEPATCHES_virtclass-native = "file://use-nativeperl.patch"
SRC_URI[md5sum] = "69bc0353323112f42ad4f9cf351bc3e5"
SRC_URI[sha256sum] = "4d1e5f8561f09c958e303d4faa885079a5e173a61d28437d0013ff5efc9e3b64"
--
1.7.5.4
^ permalink raw reply related [flat|nested] 8+ messages in thread* Re: [PATCH 1/1] intltool: remove XML::Parser check
2011-11-24 18:29 ` [PATCH 1/1] intltool: remove XML::Parser check Saul Wold
@ 2011-11-24 19:37 ` Khem Raj
2011-11-26 18:49 ` Saul Wold
0 siblings, 1 reply; 8+ messages in thread
From: Khem Raj @ 2011-11-24 19:37 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer; +Cc: openembedded-core
On Thu, Nov 24, 2011 at 10:29 AM, Saul Wold <sgw@linux.intel.com> wrote:
> Add Patch to disable the XML::Parser check in the target
> intltool.m4, this check will find the host (not native)
> XML::Parser if it's installed possibly causing Host
> contamination, but will also fail configuration if XML::Parser
> is not installed on the host.
>
> Since we know that XML::Parser is installed on the image, we don't
> really need this check, so comment it out.
if it is installed then why does it fail to detect it ?
>
> Signed-off-by: Saul Wold <sgw@linux.intel.com>
> ---
> .../intltool-0.40.6/remove-xml-check.patch | 29 ++++++++++++++++++++
> meta/recipes-devtools/intltool/intltool_0.40.6.bb | 7 +++--
> 2 files changed, 33 insertions(+), 3 deletions(-)
> create mode 100644 meta/recipes-devtools/intltool/intltool-0.40.6/remove-xml-check.patch
>
> diff --git a/meta/recipes-devtools/intltool/intltool-0.40.6/remove-xml-check.patch b/meta/recipes-devtools/intltool/intltool-0.40.6/remove-xml-check.patch
> new file mode 100644
> index 0000000..476d091
> --- /dev/null
> +++ b/meta/recipes-devtools/intltool/intltool-0.40.6/remove-xml-check.patch
> @@ -0,0 +1,29 @@
> +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-11-23 15:39:34.689561872 -0800
> +@@ -122,14 +122,16 @@
> + IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`"
> + AC_MSG_RESULT([$IT_PERL_VERSION])
> + fi
> +-if test "x$2" != "xno-xml"; then
> +- AC_MSG_CHECKING([for XML::Parser])
> +- if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then
> +- AC_MSG_RESULT([ok])
> +- else
> +- AC_MSG_ERROR([XML::Parser perl module is required for intltool])
> +- fi
> +-fi
> ++
> ++# Disable this check since we know XML::Parser is installed
> ++#if test "x$2" != "xno-xml"; then
> ++# AC_MSG_CHECKING([for XML::Parser])
> ++# if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then
> ++# AC_MSG_RESULT([ok])
> ++# else
> ++# AC_MSG_ERROR([XML::Parser perl module is required for intltool])
> ++# fi
> ++#fi
> +
> + # Substitute ALL_LINGUAS so we can use it in po/Makefile
> + AC_SUBST(ALL_LINGUAS)
> diff --git a/meta/recipes-devtools/intltool/intltool_0.40.6.bb b/meta/recipes-devtools/intltool/intltool_0.40.6.bb
> index e9871fc..8180fd8 100644
> --- a/meta/recipes-devtools/intltool/intltool_0.40.6.bb
> +++ b/meta/recipes-devtools/intltool/intltool_0.40.6.bb
> @@ -1,14 +1,15 @@
> require intltool.inc
> LICENSE="GPLv2"
> LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
> -PR = "r5"
> +PR = "r6"
>
> SRC_URI_append = " file://intltool-nowarn-0.40.0.patch \
> ${NATIVEPATCHES} \
> "
>
> -NATIVEPATCHES = "file://noperlcheck.patch"
> -NATIVEPATCHES_virtclass-native = "file://use-nativeperl.patch"
> +NATIVEPATCHES = "file://noperlcheck.patch \
> + file://remove-xml-check.patch"
> +NATIVEPATCHES_virtclass-native = "file://use-nativeperl.patch"
>
> SRC_URI[md5sum] = "69bc0353323112f42ad4f9cf351bc3e5"
> SRC_URI[sha256sum] = "4d1e5f8561f09c958e303d4faa885079a5e173a61d28437d0013ff5efc9e3b64"
> --
> 1.7.5.4
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [PATCH 1/1] intltool: remove XML::Parser check
2011-11-24 19:37 ` Khem Raj
@ 2011-11-26 18:49 ` Saul Wold
2011-11-26 21:36 ` Khem Raj
0 siblings, 1 reply; 8+ messages in thread
From: Saul Wold @ 2011-11-26 18:49 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On 11/24/2011 11:37 AM, Khem Raj wrote:
> On Thu, Nov 24, 2011 at 10:29 AM, Saul Wold<sgw@linux.intel.com> wrote:
>> Add Patch to disable the XML::Parser check in the target
>> intltool.m4, this check will find the host (not native)
>> XML::Parser if it's installed possibly causing Host
>> contamination, but will also fail configuration if XML::Parser
>> is not installed on the host.
>>
>> Since we know that XML::Parser is installed on the image, we don't
>> really need this check, so comment it out.
>
> if it is installed then why does it fail to detect it ?
>
Because the recipes that depend on intltool do not inherit perlnative,
the recipes in question are gconf and shared-mime-info. They depend on
intltool, but do not need to directly inherit perlnative (at least
according to RP).
Sau!
>>
>> Signed-off-by: Saul Wold<sgw@linux.intel.com>
>> ---
>> .../intltool-0.40.6/remove-xml-check.patch | 29 ++++++++++++++++++++
>> meta/recipes-devtools/intltool/intltool_0.40.6.bb | 7 +++--
>> 2 files changed, 33 insertions(+), 3 deletions(-)
>> create mode 100644 meta/recipes-devtools/intltool/intltool-0.40.6/remove-xml-check.patch
>>
>> diff --git a/meta/recipes-devtools/intltool/intltool-0.40.6/remove-xml-check.patch b/meta/recipes-devtools/intltool/intltool-0.40.6/remove-xml-check.patch
>> new file mode 100644
>> index 0000000..476d091
>> --- /dev/null
>> +++ b/meta/recipes-devtools/intltool/intltool-0.40.6/remove-xml-check.patch
>> @@ -0,0 +1,29 @@
>> +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-11-23 15:39:34.689561872 -0800
>> +@@ -122,14 +122,16 @@
>> + IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`"
>> + AC_MSG_RESULT([$IT_PERL_VERSION])
>> + fi
>> +-if test "x$2" != "xno-xml"; then
>> +- AC_MSG_CHECKING([for XML::Parser])
>> +- if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then
>> +- AC_MSG_RESULT([ok])
>> +- else
>> +- AC_MSG_ERROR([XML::Parser perl module is required for intltool])
>> +- fi
>> +-fi
>> ++
>> ++# Disable this check since we know XML::Parser is installed
>> ++#if test "x$2" != "xno-xml"; then
>> ++# AC_MSG_CHECKING([for XML::Parser])
>> ++# if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then
>> ++# AC_MSG_RESULT([ok])
>> ++# else
>> ++# AC_MSG_ERROR([XML::Parser perl module is required for intltool])
>> ++# fi
>> ++#fi
>> +
>> + # Substitute ALL_LINGUAS so we can use it in po/Makefile
>> + AC_SUBST(ALL_LINGUAS)
>> diff --git a/meta/recipes-devtools/intltool/intltool_0.40.6.bb b/meta/recipes-devtools/intltool/intltool_0.40.6.bb
>> index e9871fc..8180fd8 100644
>> --- a/meta/recipes-devtools/intltool/intltool_0.40.6.bb
>> +++ b/meta/recipes-devtools/intltool/intltool_0.40.6.bb
>> @@ -1,14 +1,15 @@
>> require intltool.inc
>> LICENSE="GPLv2"
>> LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
>> -PR = "r5"
>> +PR = "r6"
>>
>> SRC_URI_append = " file://intltool-nowarn-0.40.0.patch \
>> ${NATIVEPATCHES} \
>> "
>>
>> -NATIVEPATCHES = "file://noperlcheck.patch"
>> -NATIVEPATCHES_virtclass-native = "file://use-nativeperl.patch"
>> +NATIVEPATCHES = "file://noperlcheck.patch \
>> + file://remove-xml-check.patch"
>> +NATIVEPATCHES_virtclass-native = "file://use-nativeperl.patch"
>>
>> SRC_URI[md5sum] = "69bc0353323112f42ad4f9cf351bc3e5"
>> SRC_URI[sha256sum] = "4d1e5f8561f09c958e303d4faa885079a5e173a61d28437d0013ff5efc9e3b64"
>> --
>> 1.7.5.4
>>
>>
>> _______________________________________________
>> Openembedded-core mailing list
>> Openembedded-core@lists.openembedded.org
>> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [PATCH 1/1] intltool: remove XML::Parser check
2011-11-26 18:49 ` Saul Wold
@ 2011-11-26 21:36 ` Khem Raj
2011-11-27 11:37 ` Richard Purdie
0 siblings, 1 reply; 8+ messages in thread
From: Khem Raj @ 2011-11-26 21:36 UTC (permalink / raw)
To: Saul Wold; +Cc: Patches and discussions about the oe-core layer
Hi Saul
On Sat, Nov 26, 2011 at 10:49 AM, Saul Wold <sgw@linux.intel.com> wrote:
> On 11/24/2011 11:37 AM, Khem Raj wrote:
>>
>> On Thu, Nov 24, 2011 at 10:29 AM, Saul Wold<sgw@linux.intel.com> wrote:
>>>
>>> Add Patch to disable the XML::Parser check in the target
>>> intltool.m4, this check will find the host (not native)
>>> XML::Parser if it's installed possibly causing Host
>>> contamination, but will also fail configuration if XML::Parser
>>> is not installed on the host.
>>>
>>> Since we know that XML::Parser is installed on the image, we don't
>>> really need this check, so comment it out.
>>
>> if it is installed then why does it fail to detect it ?
>>
> Because the recipes that depend on intltool do not inherit perlnative, the
> recipes in question are gconf and shared-mime-info. They depend on
> intltool, but do not need to directly inherit perlnative (at least according
> to RP).
why dont they need to inherit perlnative ? If they depend on intltool which
expects that its dependees inherit perlnative. I am just worried where this
may cause issues. There might be other recipes which should need XML parser
and may not get it since we remove the test here.
>
> Sau!
>
>>>
>>> Signed-off-by: Saul Wold<sgw@linux.intel.com>
>>> ---
>>> .../intltool-0.40.6/remove-xml-check.patch | 29
>>> ++++++++++++++++++++
>>> meta/recipes-devtools/intltool/intltool_0.40.6.bb | 7 +++--
>>> 2 files changed, 33 insertions(+), 3 deletions(-)
>>> create mode 100644
>>> meta/recipes-devtools/intltool/intltool-0.40.6/remove-xml-check.patch
>>>
>>> diff --git
>>> a/meta/recipes-devtools/intltool/intltool-0.40.6/remove-xml-check.patch
>>> b/meta/recipes-devtools/intltool/intltool-0.40.6/remove-xml-check.patch
>>> new file mode 100644
>>> index 0000000..476d091
>>> --- /dev/null
>>> +++
>>> b/meta/recipes-devtools/intltool/intltool-0.40.6/remove-xml-check.patch
>>> @@ -0,0 +1,29 @@
>>> +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-11-23 15:39:34.689561872
>>> -0800
>>> +@@ -122,14 +122,16 @@
>>> + IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`"
>>> + AC_MSG_RESULT([$IT_PERL_VERSION])
>>> + fi
>>> +-if test "x$2" != "xno-xml"; then
>>> +- AC_MSG_CHECKING([for XML::Parser])
>>> +- if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then
>>> +- AC_MSG_RESULT([ok])
>>> +- else
>>> +- AC_MSG_ERROR([XML::Parser perl module is required for intltool])
>>> +- fi
>>> +-fi
>>> ++
>>> ++# Disable this check since we know XML::Parser is installed
>>> ++#if test "x$2" != "xno-xml"; then
>>> ++# AC_MSG_CHECKING([for XML::Parser])
>>> ++# if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then
>>> ++# AC_MSG_RESULT([ok])
>>> ++# else
>>> ++# AC_MSG_ERROR([XML::Parser perl module is required for
>>> intltool])
>>> ++# fi
>>> ++#fi
>>> +
>>> + # Substitute ALL_LINGUAS so we can use it in po/Makefile
>>> + AC_SUBST(ALL_LINGUAS)
>>> diff --git a/meta/recipes-devtools/intltool/intltool_0.40.6.bb
>>> b/meta/recipes-devtools/intltool/intltool_0.40.6.bb
>>> index e9871fc..8180fd8 100644
>>> --- a/meta/recipes-devtools/intltool/intltool_0.40.6.bb
>>> +++ b/meta/recipes-devtools/intltool/intltool_0.40.6.bb
>>> @@ -1,14 +1,15 @@
>>> require intltool.inc
>>> LICENSE="GPLv2"
>>> LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
>>> -PR = "r5"
>>> +PR = "r6"
>>>
>>> SRC_URI_append = " file://intltool-nowarn-0.40.0.patch \
>>> ${NATIVEPATCHES} \
>>> "
>>>
>>> -NATIVEPATCHES = "file://noperlcheck.patch"
>>> -NATIVEPATCHES_virtclass-native = "file://use-nativeperl.patch"
>>> +NATIVEPATCHES = "file://noperlcheck.patch \
>>> + file://remove-xml-check.patch"
>>> +NATIVEPATCHES_virtclass-native = "file://use-nativeperl.patch"
>>>
>>> SRC_URI[md5sum] = "69bc0353323112f42ad4f9cf351bc3e5"
>>> SRC_URI[sha256sum] =
>>> "4d1e5f8561f09c958e303d4faa885079a5e173a61d28437d0013ff5efc9e3b64"
>>> --
>>> 1.7.5.4
>>>
>>>
>>> _______________________________________________
>>> Openembedded-core mailing list
>>> Openembedded-core@lists.openembedded.org
>>> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>>>
>>
>> _______________________________________________
>> Openembedded-core mailing list
>> Openembedded-core@lists.openembedded.org
>> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [PATCH 1/1] intltool: remove XML::Parser check
2011-11-26 21:36 ` Khem Raj
@ 2011-11-27 11:37 ` Richard Purdie
2011-11-27 17:03 ` Khem Raj
0 siblings, 1 reply; 8+ messages in thread
From: Richard Purdie @ 2011-11-27 11:37 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Sat, 2011-11-26 at 13:36 -0800, Khem Raj wrote:
> Hi Saul
>
> On Sat, Nov 26, 2011 at 10:49 AM, Saul Wold <sgw@linux.intel.com> wrote:
> > On 11/24/2011 11:37 AM, Khem Raj wrote:
> >>
> >> On Thu, Nov 24, 2011 at 10:29 AM, Saul Wold<sgw@linux.intel.com> wrote:
> >>>
> >>> Add Patch to disable the XML::Parser check in the target
> >>> intltool.m4, this check will find the host (not native)
> >>> XML::Parser if it's installed possibly causing Host
> >>> contamination, but will also fail configuration if XML::Parser
> >>> is not installed on the host.
> >>>
> >>> Since we know that XML::Parser is installed on the image, we don't
> >>> really need this check, so comment it out.
> >>
> >> if it is installed then why does it fail to detect it ?
> >>
> > Because the recipes that depend on intltool do not inherit perlnative, the
> > recipes in question are gconf and shared-mime-info. They depend on
> > intltool, but do not need to directly inherit perlnative (at least according
> > to RP).
>
> why dont they need to inherit perlnative ? If they depend on intltool which
> expects that its dependees inherit perlnative. I am just worried where this
> may cause issues. There might be other recipes which should need XML parser
> and may not get it since we remove the test here.
All of the intltool scripts have the correct paths to perl already
embedded into them and can find perl fine. If the recipe needs perl for
some other reason than intltool, it needs perlnative but it if only
needs perl for intltool, we shouldn't need the dependency. The .m4 macro
checks are well intended but don't fit the way we use perl. I really
don't want to end up in a position where intltool automatically means we
have to add perlnative as a dependency and we've previously seen many
problems related to that.
Cheers,
Richard
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 1/1] intltool: remove XML::Parser check
2011-11-27 11:37 ` Richard Purdie
@ 2011-11-27 17:03 ` Khem Raj
0 siblings, 0 replies; 8+ messages in thread
From: Khem Raj @ 2011-11-27 17:03 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Sun, Nov 27, 2011 at 3:37 AM, Richard Purdie
<richard.purdie@linuxfoundation.org> wrote:
> On Sat, 2011-11-26 at 13:36 -0800, Khem Raj wrote:
>> Hi Saul
>>
>> On Sat, Nov 26, 2011 at 10:49 AM, Saul Wold <sgw@linux.intel.com> wrote:
>> > On 11/24/2011 11:37 AM, Khem Raj wrote:
>> >>
>> >> On Thu, Nov 24, 2011 at 10:29 AM, Saul Wold<sgw@linux.intel.com> wrote:
>> >>>
>> >>> Add Patch to disable the XML::Parser check in the target
>> >>> intltool.m4, this check will find the host (not native)
>> >>> XML::Parser if it's installed possibly causing Host
>> >>> contamination, but will also fail configuration if XML::Parser
>> >>> is not installed on the host.
>> >>>
>> >>> Since we know that XML::Parser is installed on the image, we don't
>> >>> really need this check, so comment it out.
>> >>
>> >> if it is installed then why does it fail to detect it ?
>> >>
>> > Because the recipes that depend on intltool do not inherit perlnative, the
>> > recipes in question are gconf and shared-mime-info. They depend on
>> > intltool, but do not need to directly inherit perlnative (at least according
>> > to RP).
>>
>> why dont they need to inherit perlnative ? If they depend on intltool which
>> expects that its dependees inherit perlnative. I am just worried where this
>> may cause issues. There might be other recipes which should need XML parser
>> and may not get it since we remove the test here.
>
> All of the intltool scripts have the correct paths to perl already
> embedded into them and can find perl fine.
I see. I think this should be added to comments somewhere may be in
intltool recipe itself
and I hope this also works for target intltool recipe.
If the recipe needs perl for
> some other reason than intltool, it needs perlnative but it if only
> needs perl for intltool, we shouldn't need the dependency. The .m4 macro
> checks are well intended but don't fit the way we use perl. I really
> don't want to end up in a position where intltool automatically means we
> have to add perlnative as a dependency and we've previously seen many
> problems related to that.
agreed.
>
> Cheers,
>
> Richard
>
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 0/1] Fix for host conamination (v2)
@ 2011-11-28 19:28 Saul Wold
2011-11-28 19:28 ` [PATCH 1/1] intltool: remove XML::Parser check Saul Wold
0 siblings, 1 reply; 8+ messages in thread
From: Saul Wold @ 2011-11-28 19:28 UTC (permalink / raw)
To: openembedded-core
This address a problem where a intltool.m4 check will fail if
the host system does not have XML::Parser installed.
v2: Update both Commit comment and recipe with more info about why this
is needed based on email thread.
Sau!
The following changes since commit 2864ff6a4b3c3f9b3bbb6d2597243cc5d3715939:
getVar/setVar cleanups (2011-11-26 22:42:00 +0000)
are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib sgw/fix
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=sgw/fix
Saul Wold (1):
intltool: remove XML::Parser check
.../intltool-0.40.6/remove-xml-check.patch | 29 ++++++++++++++++++++
meta/recipes-devtools/intltool/intltool_0.40.6.bb | 11 +++++--
2 files changed, 37 insertions(+), 3 deletions(-)
create mode 100644 meta/recipes-devtools/intltool/intltool-0.40.6/remove-xml-check.patch
--
1.7.6.4
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 1/1] intltool: remove XML::Parser check
2011-11-28 19:28 [PATCH 0/1] Fix for host conamination (v2) Saul Wold
@ 2011-11-28 19:28 ` Saul Wold
0 siblings, 0 replies; 8+ messages in thread
From: Saul Wold @ 2011-11-28 19:28 UTC (permalink / raw)
To: openembedded-core
Add Patch to disable the XML::Parser check in the target
intltool.m4, this check will find the host (not native)
XML::Parser if it's installed possibly causing Host
contamination, but will also fail configuration if XML::Parser
is not installed on the host.
Since we know that XML::Parser is installed on the image, we don't
really need this check, so comment it out.
From RP in mail thread:
> If the recipe needs perl for
> some other reason than intltool, it needs perlnative but it if only
> needs perl for intltool, we shouldn't need the dependency. The .m4 macro
> checks are well intended but don't fit the way we use perl. I really
> don't want to end up in a position where intltool automatically means we
> have to add perlnative as a dependency and we've previously seen many
> problems related to that.
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
.../intltool-0.40.6/remove-xml-check.patch | 29 ++++++++++++++++++++
meta/recipes-devtools/intltool/intltool_0.40.6.bb | 11 +++++--
2 files changed, 37 insertions(+), 3 deletions(-)
create mode 100644 meta/recipes-devtools/intltool/intltool-0.40.6/remove-xml-check.patch
diff --git a/meta/recipes-devtools/intltool/intltool-0.40.6/remove-xml-check.patch b/meta/recipes-devtools/intltool/intltool-0.40.6/remove-xml-check.patch
new file mode 100644
index 0000000..476d091
--- /dev/null
+++ b/meta/recipes-devtools/intltool/intltool-0.40.6/remove-xml-check.patch
@@ -0,0 +1,29 @@
+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-11-23 15:39:34.689561872 -0800
+@@ -122,14 +122,16 @@
+ IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`"
+ AC_MSG_RESULT([$IT_PERL_VERSION])
+ fi
+-if test "x$2" != "xno-xml"; then
+- AC_MSG_CHECKING([for XML::Parser])
+- if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then
+- AC_MSG_RESULT([ok])
+- else
+- AC_MSG_ERROR([XML::Parser perl module is required for intltool])
+- fi
+-fi
++
++# Disable this check since we know XML::Parser is installed
++#if test "x$2" != "xno-xml"; then
++# AC_MSG_CHECKING([for XML::Parser])
++# if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then
++# AC_MSG_RESULT([ok])
++# else
++# AC_MSG_ERROR([XML::Parser perl module is required for intltool])
++# fi
++#fi
+
+ # Substitute ALL_LINGUAS so we can use it in po/Makefile
+ AC_SUBST(ALL_LINGUAS)
diff --git a/meta/recipes-devtools/intltool/intltool_0.40.6.bb b/meta/recipes-devtools/intltool/intltool_0.40.6.bb
index e9871fc..c820f11 100644
--- a/meta/recipes-devtools/intltool/intltool_0.40.6.bb
+++ b/meta/recipes-devtools/intltool/intltool_0.40.6.bb
@@ -1,14 +1,19 @@
require intltool.inc
LICENSE="GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
-PR = "r5"
+PR = "r6"
SRC_URI_append = " file://intltool-nowarn-0.40.0.patch \
${NATIVEPATCHES} \
"
-NATIVEPATCHES = "file://noperlcheck.patch"
-NATIVEPATCHES_virtclass-native = "file://use-nativeperl.patch"
+#
+# All of the intltool scripts have the correct paths to perl already
+# embedded into them and can find perl fine, so we add the remove xml-check
+# in the intltool.m4 via the remove-xml-check.patch
+NATIVEPATCHES = "file://noperlcheck.patch \
+ file://remove-xml-check.patch"
+NATIVEPATCHES_virtclass-native = "file://use-nativeperl.patch"
SRC_URI[md5sum] = "69bc0353323112f42ad4f9cf351bc3e5"
SRC_URI[sha256sum] = "4d1e5f8561f09c958e303d4faa885079a5e173a61d28437d0013ff5efc9e3b64"
--
1.7.6.4
^ permalink raw reply related [flat|nested] 8+ messages in thread
end of thread, other threads:[~2011-11-28 19:34 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-11-24 18:29 [PATCH 0/1] Fix for host conamination Saul Wold
2011-11-24 18:29 ` [PATCH 1/1] intltool: remove XML::Parser check Saul Wold
2011-11-24 19:37 ` Khem Raj
2011-11-26 18:49 ` Saul Wold
2011-11-26 21:36 ` Khem Raj
2011-11-27 11:37 ` Richard Purdie
2011-11-27 17:03 ` Khem Raj
-- strict thread matches above, loose matches on Subject: below --
2011-11-28 19:28 [PATCH 0/1] Fix for host conamination (v2) Saul Wold
2011-11-28 19:28 ` [PATCH 1/1] intltool: remove XML::Parser check Saul Wold
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox