perl: don't package the host configuration

Submitted by Ross Burton on Feb. 6, 2020, 10:07 p.m. | Patch ID: 169797

Details

Message ID 20200206220704.1109-1-ross@burtonini.com
State New
Headers show

Commit Message

Ross Burton Feb. 6, 2020, 10:07 p.m.
From: Ross Burton <ross.burton@intel.com>

`make install` installs xconfig.h, which is the configuration of the
*build host* used when building miniperl, used to bootstrap the Perl
build.

As this changes depending on the build host, remove don't install it.

[ YOCTO #13372 ]

Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 meta/recipes-devtools/perl/perl_5.30.1.bb | 4 ++++
 1 file changed, 4 insertions(+)

Patch hide | download patch | download mbox

diff --git a/meta/recipes-devtools/perl/perl_5.30.1.bb b/meta/recipes-devtools/perl/perl_5.30.1.bb
index d4b6bb32b43..8af9dfa4a2c 100644
--- a/meta/recipes-devtools/perl/perl_5.30.1.bb
+++ b/meta/recipes-devtools/perl/perl_5.30.1.bb
@@ -139,6 +139,10 @@  do_install() {
     # Fix up shared library
     rm ${D}/${libdir}/perl5/${PV}/*/CORE/libperl.so
     ln -sf ../../../../libperl.so.${PERL_LIB_VER} $(echo ${D}/${libdir}/perl5/${PV}/*/CORE)/libperl.so
+
+    # This is the native configuration for the bootstrap perl, don't need it
+    # packaged.
+    rm -f ${D}${libdir}/perl5/${PV}/*/CORE/xconfig.h
 }
 
 do_install_append_class-target() {

Comments

Jeremy Puhlman Feb. 6, 2020, 10:16 p.m.
Should that bug number be 13772 not 13372?

On 2/6/2020 2:07 PM, Ross Burton wrote:
> From: Ross Burton <ross.burton@intel.com>
>
> `make install` installs xconfig.h, which is the configuration of the
> *build host* used when building miniperl, used to bootstrap the Perl
> build.
>
> As this changes depending on the build host, remove don't install it.
>
> [ YOCTO #13372 ]
>
> Signed-off-by: Ross Burton <ross.burton@intel.com>
> ---
>   meta/recipes-devtools/perl/perl_5.30.1.bb | 4 ++++
>   1 file changed, 4 insertions(+)
>
> diff --git a/meta/recipes-devtools/perl/perl_5.30.1.bb b/meta/recipes-devtools/perl/perl_5.30.1.bb
> index d4b6bb32b43..8af9dfa4a2c 100644
> --- a/meta/recipes-devtools/perl/perl_5.30.1.bb
> +++ b/meta/recipes-devtools/perl/perl_5.30.1.bb
> @@ -139,6 +139,10 @@ do_install() {
>       # Fix up shared library
>       rm ${D}/${libdir}/perl5/${PV}/*/CORE/libperl.so
>       ln -sf ../../../../libperl.so.${PERL_LIB_VER} $(echo ${D}/${libdir}/perl5/${PV}/*/CORE)/libperl.so
> +
> +    # This is the native configuration for the bootstrap perl, don't need it
> +    # packaged.
> +    rm -f ${D}${libdir}/perl5/${PV}/*/CORE/xconfig.h
>   }
>   
>   do_install_append_class-target() {
Alexander Kanavin Feb. 6, 2020, 10:16 p.m.
My patch is more comprehensive, as it also adjusts the ptests ;)

Alex

On Thu, 6 Feb 2020 at 23:07, Ross Burton <ross@burtonini.com> wrote:

> From: Ross Burton <ross.burton@intel.com>
>
> `make install` installs xconfig.h, which is the configuration of the
> *build host* used when building miniperl, used to bootstrap the Perl
> build.
>
> As this changes depending on the build host, remove don't install it.
>
> [ YOCTO #13372 ]
>
> Signed-off-by: Ross Burton <ross.burton@intel.com>
> ---
>  meta/recipes-devtools/perl/perl_5.30.1.bb | 4 ++++
>  1 file changed, 4 insertions(+)
>
> diff --git a/meta/recipes-devtools/perl/perl_5.30.1.bb
> b/meta/recipes-devtools/perl/perl_5.30.1.bb
> index d4b6bb32b43..8af9dfa4a2c 100644
> --- a/meta/recipes-devtools/perl/perl_5.30.1.bb
> +++ b/meta/recipes-devtools/perl/perl_5.30.1.bb
> @@ -139,6 +139,10 @@ do_install() {
>      # Fix up shared library
>      rm ${D}/${libdir}/perl5/${PV}/*/CORE/libperl.so
>      ln -sf ../../../../libperl.so.${PERL_LIB_VER} $(echo
> ${D}/${libdir}/perl5/${PV}/*/CORE)/libperl.so
> +
> +    # This is the native configuration for the bootstrap perl, don't need
> it
> +    # packaged.
> +    rm -f ${D}${libdir}/perl5/${PV}/*/CORE/xconfig.h
>  }
>
>  do_install_append_class-target() {
> --
> 2.20.1
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>
Ross Burton Feb. 6, 2020, 10:37 p.m.
Note to self: it’s time to stop working.

On Thu, 6 Feb 2020 at 22:16, Alexander Kanavin <alex.kanavin@gmail.com>
wrote:

> My patch is more comprehensive, as it also adjusts the ptests ;)
>
> Alex
>
> On Thu, 6 Feb 2020 at 23:07, Ross Burton <ross@burtonini.com> wrote:
>
>> From: Ross Burton <ross.burton@intel.com>
>>
>> `make install` installs xconfig.h, which is the configuration of the
>> *build host* used when building miniperl, used to bootstrap the Perl
>> build.
>>
>> As this changes depending on the build host, remove don't install it.
>>
>> [ YOCTO #13372 ]
>>
>> Signed-off-by: Ross Burton <ross.burton@intel.com>
>> ---
>>  meta/recipes-devtools/perl/perl_5.30.1.bb | 4 ++++
>>  1 file changed, 4 insertions(+)
>>
>> diff --git a/meta/recipes-devtools/perl/perl_5.30.1.bb
>> b/meta/recipes-devtools/perl/perl_5.30.1.bb
>> index d4b6bb32b43..8af9dfa4a2c 100644
>> --- a/meta/recipes-devtools/perl/perl_5.30.1.bb
>> +++ b/meta/recipes-devtools/perl/perl_5.30.1.bb
>> @@ -139,6 +139,10 @@ do_install() {
>>      # Fix up shared library
>>      rm ${D}/${libdir}/perl5/${PV}/*/CORE/libperl.so
>>      ln -sf ../../../../libperl.so.${PERL_LIB_VER} $(echo
>> ${D}/${libdir}/perl5/${PV}/*/CORE)/libperl.so
>> +
>> +    # This is the native configuration for the bootstrap perl, don't
>> need it
>> +    # packaged.
>> +    rm -f ${D}${libdir}/perl5/${PV}/*/CORE/xconfig.h
>>  }
>>
>>  do_install_append_class-target() {
>> --
>> 2.20.1
>>
>> --
>> _______________________________________________
>> Openembedded-core mailing list
>> Openembedded-core@lists.openembedded.org
>> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>>
>