* [PATCH] perl: Remove the changes of bin, lib etc. as the defaults will give sane values.
@ 2012-09-06 8:29 Martin Ertsaas
2012-09-06 19:11 ` Saul Wold
0 siblings, 1 reply; 4+ messages in thread
From: Martin Ertsaas @ 2012-09-06 8:29 UTC (permalink / raw)
To: openembedded-core
The old config put stuff in ${perldir}/image/usr/local/oecore-x86_64/sysroot/x86_64-unknownsdk-linux/usr/local/oecore-x86_64/sysroots/x86_64-unknownsdk-linux/usr
instead of in ${perldir}/image/usr/local/oecore-x86_64/sysroot/x86_64-nimbussdk-linux/usr as it should.
---
meta/recipes-devtools/perl/perl_5.14.2.bb | 19 ++++++++-----------
1 files changed, 8 insertions(+), 11 deletions(-)
diff --git a/meta/recipes-devtools/perl/perl_5.14.2.bb b/meta/recipes-devtools/perl/perl_5.14.2.bb
index 3c1360f..04e2597 100644
--- a/meta/recipes-devtools/perl/perl_5.14.2.bb
+++ b/meta/recipes-devtools/perl/perl_5.14.2.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://Copying;md5=2b4c6ffbcfcbdee469f02565f253d81a \
# We need gnugrep (for -I)
DEPENDS = "virtual/db grep-native"
DEPENDS += "gdbm zlib"
-PR = "r9"
+PR = "r10"
# 5.10.1 has Module::Build built-in
PROVIDES += "libmodule-build-perl"
@@ -145,16 +145,13 @@ do_configure() {
${@base_contains('DISTRO_FEATURES', 'largefile', '', 'do_nolargefile', d)}
- # Update some paths in the configuration
- sed -i -e 's,@DESTDIR@,${prefix},g' \
- -e 's,@ARCH@-thread-multi,,g' \
- -e 's,@ARCH@,${TARGET_ARCH}-${TARGET_OS},g' \
- -e 's,@STAGINGDIR@,${STAGING_DIR_HOST},g' \
- -e "s%\([ \"^\',=]\+\)/usr/include%\1${STAGING_INCDIR}%g" \
- -e "s%\([ \"^\',=]\+\)/usr/lib/%\1${libdir}/%g" \
- -e "s%\([ \"^\',=]\+\)/usr/%\1${exec_prefix}/%g" \
- -e "s%/perl5%/perl%g" \
- config.sh-${TARGET_ARCH}-${TARGET_OS}
+ # Update some paths in the configuration
+ sed -i -e 's,@DESTDIR@,${prefix},g' \
+ -e 's,@ARCH@-thread-multi,,g' \
+ -e 's,@ARCH@,${TARGET_ARCH}-${TARGET_OS},g' \
+ -e 's,@STAGINGDIR@,${STAGING_DIR_HOST},g' \
+ -e "s%/perl5%/perl%g" \
+ config.sh-${TARGET_ARCH}-${TARGET_OS}
case "${TARGET_ARCH}" in
x86_64 | powerpc | s390)
--
1.7.8.6
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] perl: Remove the changes of bin, lib etc. as the defaults will give sane values.
2012-09-06 8:29 [PATCH] perl: Remove the changes of bin, lib etc. as the defaults will give sane values Martin Ertsaas
@ 2012-09-06 19:11 ` Saul Wold
2012-09-06 19:43 ` Mark Hatle
0 siblings, 1 reply; 4+ messages in thread
From: Saul Wold @ 2012-09-06 19:11 UTC (permalink / raw)
To: Martin Ertsaas; +Cc: openembedded-core
On 09/06/2012 01:29 AM, Martin Ertsaas wrote:
> The old config put stuff in ${perldir}/image/usr/local/oecore-x86_64/sysroot/x86_64-unknownsdk-linux/usr/local/oecore-x86_64/sysroots/x86_64-unknownsdk-linux/usr
> instead of in ${perldir}/image/usr/local/oecore-x86_64/sysroot/x86_64-nimbussdk-linux/usr as it should.
I am not sure we want to remove that sed code, since allows for
different ${libdir} than /usr/lib, such as a flattened /lib, same with
the ${exec_prefix}.
Sau!
> ---
> meta/recipes-devtools/perl/perl_5.14.2.bb | 19 ++++++++-----------
> 1 files changed, 8 insertions(+), 11 deletions(-)
>
> diff --git a/meta/recipes-devtools/perl/perl_5.14.2.bb b/meta/recipes-devtools/perl/perl_5.14.2.bb
> index 3c1360f..04e2597 100644
> --- a/meta/recipes-devtools/perl/perl_5.14.2.bb
> +++ b/meta/recipes-devtools/perl/perl_5.14.2.bb
> @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://Copying;md5=2b4c6ffbcfcbdee469f02565f253d81a \
> # We need gnugrep (for -I)
> DEPENDS = "virtual/db grep-native"
> DEPENDS += "gdbm zlib"
> -PR = "r9"
> +PR = "r10"
>
> # 5.10.1 has Module::Build built-in
> PROVIDES += "libmodule-build-perl"
> @@ -145,16 +145,13 @@ do_configure() {
>
> ${@base_contains('DISTRO_FEATURES', 'largefile', '', 'do_nolargefile', d)}
>
> - # Update some paths in the configuration
> - sed -i -e 's,@DESTDIR@,${prefix},g' \
> - -e 's,@ARCH@-thread-multi,,g' \
> - -e 's,@ARCH@,${TARGET_ARCH}-${TARGET_OS},g' \
> - -e 's,@STAGINGDIR@,${STAGING_DIR_HOST},g' \
> - -e "s%\([ \"^\',=]\+\)/usr/include%\1${STAGING_INCDIR}%g" \
> - -e "s%\([ \"^\',=]\+\)/usr/lib/%\1${libdir}/%g" \
> - -e "s%\([ \"^\',=]\+\)/usr/%\1${exec_prefix}/%g" \
> - -e "s%/perl5%/perl%g" \
> - config.sh-${TARGET_ARCH}-${TARGET_OS}
> + # Update some paths in the configuration
> + sed -i -e 's,@DESTDIR@,${prefix},g' \
> + -e 's,@ARCH@-thread-multi,,g' \
> + -e 's,@ARCH@,${TARGET_ARCH}-${TARGET_OS},g' \
> + -e 's,@STAGINGDIR@,${STAGING_DIR_HOST},g' \
> + -e "s%/perl5%/perl%g" \
> + config.sh-${TARGET_ARCH}-${TARGET_OS}
>
> case "${TARGET_ARCH}" in
> x86_64 | powerpc | s390)
>
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] perl: Remove the changes of bin, lib etc. as the defaults will give sane values.
2012-09-06 19:11 ` Saul Wold
@ 2012-09-06 19:43 ` Mark Hatle
2012-09-10 5:51 ` Martin Ertsås
0 siblings, 1 reply; 4+ messages in thread
From: Mark Hatle @ 2012-09-06 19:43 UTC (permalink / raw)
To: openembedded-core
On 9/6/12 2:11 PM, Saul Wold wrote:
> On 09/06/2012 01:29 AM, Martin Ertsaas wrote:
>> The old config put stuff in ${perldir}/image/usr/local/oecore-x86_64/sysroot/x86_64-unknownsdk-linux/usr/local/oecore-x86_64/sysroots/x86_64-unknownsdk-linux/usr
>> instead of in ${perldir}/image/usr/local/oecore-x86_64/sysroot/x86_64-nimbussdk-linux/usr as it should.
>
> I am not sure we want to remove that sed code, since allows for
> different ${libdir} than /usr/lib, such as a flattened /lib, same with
> the ${exec_prefix}.
Ya, the sed lines are specifically there to enable the end user to modify the
exec_prefix and libdir to their local distribution policies. If this is no
longer necessary, we can remove it.. but someone needs to verify they are being
used properly. (Flattened filesystem and multilibs are the two places I know
it's used today.)
--Mark
> Sau!
>
>
>> ---
>> meta/recipes-devtools/perl/perl_5.14.2.bb | 19 ++++++++-----------
>> 1 files changed, 8 insertions(+), 11 deletions(-)
>>
>> diff --git a/meta/recipes-devtools/perl/perl_5.14.2.bb b/meta/recipes-devtools/perl/perl_5.14.2.bb
>> index 3c1360f..04e2597 100644
>> --- a/meta/recipes-devtools/perl/perl_5.14.2.bb
>> +++ b/meta/recipes-devtools/perl/perl_5.14.2.bb
>> @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://Copying;md5=2b4c6ffbcfcbdee469f02565f253d81a \
>> # We need gnugrep (for -I)
>> DEPENDS = "virtual/db grep-native"
>> DEPENDS += "gdbm zlib"
>> -PR = "r9"
>> +PR = "r10"
>>
>> # 5.10.1 has Module::Build built-in
>> PROVIDES += "libmodule-build-perl"
>> @@ -145,16 +145,13 @@ do_configure() {
>>
>> ${@base_contains('DISTRO_FEATURES', 'largefile', '', 'do_nolargefile', d)}
>>
>> - # Update some paths in the configuration
>> - sed -i -e 's,@DESTDIR@,${prefix},g' \
>> - -e 's,@ARCH@-thread-multi,,g' \
>> - -e 's,@ARCH@,${TARGET_ARCH}-${TARGET_OS},g' \
>> - -e 's,@STAGINGDIR@,${STAGING_DIR_HOST},g' \
>> - -e "s%\([ \"^\',=]\+\)/usr/include%\1${STAGING_INCDIR}%g" \
>> - -e "s%\([ \"^\',=]\+\)/usr/lib/%\1${libdir}/%g" \
>> - -e "s%\([ \"^\',=]\+\)/usr/%\1${exec_prefix}/%g" \
>> - -e "s%/perl5%/perl%g" \
>> - config.sh-${TARGET_ARCH}-${TARGET_OS}
>> + # Update some paths in the configuration
>> + sed -i -e 's,@DESTDIR@,${prefix},g' \
>> + -e 's,@ARCH@-thread-multi,,g' \
>> + -e 's,@ARCH@,${TARGET_ARCH}-${TARGET_OS},g' \
>> + -e 's,@STAGINGDIR@,${STAGING_DIR_HOST},g' \
>> + -e "s%/perl5%/perl%g" \
>> + config.sh-${TARGET_ARCH}-${TARGET_OS}
>>
>> case "${TARGET_ARCH}" in
>> x86_64 | powerpc | s390)
>>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] perl: Remove the changes of bin, lib etc. as the defaults will give sane values.
2012-09-06 19:43 ` Mark Hatle
@ 2012-09-10 5:51 ` Martin Ertsås
0 siblings, 0 replies; 4+ messages in thread
From: Martin Ertsås @ 2012-09-10 5:51 UTC (permalink / raw)
To: openembedded-core
On 09/06/12 21:43, Mark Hatle wrote:
> On 9/6/12 2:11 PM, Saul Wold wrote:
>> On 09/06/2012 01:29 AM, Martin Ertsaas wrote:
>>> The old config put stuff in
>>> ${perldir}/image/usr/local/oecore-x86_64/sysroot/x86_64-unknownsdk-linux/usr/local/oecore-x86_64/sysroots/x86_64-unknownsdk-linux/usr
>>> instead of in
>>> ${perldir}/image/usr/local/oecore-x86_64/sysroot/x86_64-nimbussdk-linux/usr
>>> as it should.
>>
>> I am not sure we want to remove that sed code, since allows for
>> different ${libdir} than /usr/lib, such as a flattened /lib, same with
>> the ${exec_prefix}.
>
> Ya, the sed lines are specifically there to enable the end user to
> modify the exec_prefix and libdir to their local distribution
> policies. If this is no longer necessary, we can remove it.. but
> someone needs to verify they are being used properly. (Flattened
> filesystem and multilibs are the two places I know it's used today.)
>
> --Mark
Ok. That is ok. However, I think we would need to fix it to give a sane
default value, like
${perldir}/image/usr/local/oecore-x86_64/sysroot/x86_64-unknownsdk-linux/usr.
Not the part after image is duplicated in the install directory, which
makes do_install fail if you try to use the standard directory.
- Martin
>
>> Sau!
>>
>>
>>> ---
>>> meta/recipes-devtools/perl/perl_5.14.2.bb | 19 ++++++++-----------
>>> 1 files changed, 8 insertions(+), 11 deletions(-)
>>>
>>> diff --git a/meta/recipes-devtools/perl/perl_5.14.2.bb
>>> b/meta/recipes-devtools/perl/perl_5.14.2.bb
>>> index 3c1360f..04e2597 100644
>>> --- a/meta/recipes-devtools/perl/perl_5.14.2.bb
>>> +++ b/meta/recipes-devtools/perl/perl_5.14.2.bb
>>> @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM =
>>> "file://Copying;md5=2b4c6ffbcfcbdee469f02565f253d81a \
>>> # We need gnugrep (for -I)
>>> DEPENDS = "virtual/db grep-native"
>>> DEPENDS += "gdbm zlib"
>>> -PR = "r9"
>>> +PR = "r10"
>>>
>>> # 5.10.1 has Module::Build built-in
>>> PROVIDES += "libmodule-build-perl"
>>> @@ -145,16 +145,13 @@ do_configure() {
>>>
>>> ${@base_contains('DISTRO_FEATURES', 'largefile', '',
>>> 'do_nolargefile', d)}
>>>
>>> - # Update some paths in the configuration
>>> - sed -i -e 's,@DESTDIR@,${prefix},g' \
>>> - -e 's,@ARCH@-thread-multi,,g' \
>>> - -e 's,@ARCH@,${TARGET_ARCH}-${TARGET_OS},g' \
>>> - -e 's,@STAGINGDIR@,${STAGING_DIR_HOST},g' \
>>> - -e "s%\([
>>> \"^\',=]\+\)/usr/include%\1${STAGING_INCDIR}%g" \
>>> - -e "s%\([ \"^\',=]\+\)/usr/lib/%\1${libdir}/%g" \
>>> - -e "s%\([ \"^\',=]\+\)/usr/%\1${exec_prefix}/%g" \
>>> - -e "s%/perl5%/perl%g" \
>>> - config.sh-${TARGET_ARCH}-${TARGET_OS}
>>> + # Update some paths in the configuration
>>> + sed -i -e 's,@DESTDIR@,${prefix},g' \
>>> + -e 's,@ARCH@-thread-multi,,g' \
>>> + -e 's,@ARCH@,${TARGET_ARCH}-${TARGET_OS},g' \
>>> + -e 's,@STAGINGDIR@,${STAGING_DIR_HOST},g' \
>>> + -e "s%/perl5%/perl%g" \
>>> + config.sh-${TARGET_ARCH}-${TARGET_OS}
>>>
>>> case "${TARGET_ARCH}" in
>>> x86_64 | powerpc | s390)
>>>
>>
>> _______________________________________________
>> 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] 4+ messages in thread
end of thread, other threads:[~2012-09-10 6:08 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-09-06 8:29 [PATCH] perl: Remove the changes of bin, lib etc. as the defaults will give sane values Martin Ertsaas
2012-09-06 19:11 ` Saul Wold
2012-09-06 19:43 ` Mark Hatle
2012-09-10 5:51 ` Martin Ertsås
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox