Patchwork [2/2] perl: use archlib_exp config.sh variable

login
register
mail settings
Submitter Tom Zanussi
Date Oct. 10, 2012, 12:48 a.m.
Message ID <2bc985f69847a615429a908aa0e8f972a8be91f9.1349829329.git.tom.zanussi@intel.com>
Download mbox | patch
Permalink /patch/38041/
State New
Headers show

Comments

Tom Zanussi - Oct. 10, 2012, 12:48 a.m.
From: Tom Zanussi <tom.zanussi@intel.com>

This patch uses an unmodified version of archlibexp called
archlib_exp, introduced by a previous patch to config.sh, which is
used to generate the correct value of ARCHLIB_EXP into config.h

Fixes [YOCTO #3099].

Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
---
 .../perl/perl-5.14.2/perl-archlib-exp.patch               | 15 +++++++++++++++
 meta/recipes-devtools/perl/perl_5.14.2.bb                 |  3 ++-
 2 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 meta/recipes-devtools/perl/perl-5.14.2/perl-archlib-exp.patch
Kang Kai - Oct. 10, 2012, 3 a.m.
On 2012?10?10? 08:48, tom.zanussi@intel.com wrote:
> From: Tom Zanussi<tom.zanussi@intel.com>
>
> This patch uses an unmodified version of archlibexp called
> archlib_exp, introduced by a previous patch to config.sh, which is
> used to generate the correct value of ARCHLIB_EXP into config.h
>
> Fixes [YOCTO #3099].
>
> Signed-off-by: Tom Zanussi<tom.zanussi@intel.com>
> ---
>   .../perl/perl-5.14.2/perl-archlib-exp.patch               | 15 +++++++++++++++
>   meta/recipes-devtools/perl/perl_5.14.2.bb                 |  3 ++-
>   2 files changed, 17 insertions(+), 1 deletion(-)
>   create mode 100644 meta/recipes-devtools/perl/perl-5.14.2/perl-archlib-exp.patch
>
> diff --git a/meta/recipes-devtools/perl/perl-5.14.2/perl-archlib-exp.patch b/meta/recipes-devtools/perl/perl-5.14.2/perl-archlib-exp.patch
> new file mode 100644
> index 0000000..1c170ef
> --- /dev/null
> +++ b/meta/recipes-devtools/perl/perl-5.14.2/perl-archlib-exp.patch
> @@ -0,0 +1,15 @@
> +Upstream-Status:Inappropriate [embedded specific]
> +
> +Index: perl-5.14.2/config_h.SH
> +===================================================================
> +--- perl-5.14.2.orig/config_h.SH
> ++++ perl-5.14.2/config_h.SH
> +@@ -996,7 +996,7 @@ sed<<!GROK!THIS!>$CONFIG_H -e 's!^#und
> +  *	in programs that are not prepared to deal with ~ expansion at run-time.
> +  */
> + #$d_archlib ARCHLIB "$archlib"		/**/
> +-#$d_archlib ARCHLIB_EXP "$archlibexp"		/**/
> ++#$d_archlib ARCHLIB_EXP "$archlib_exp"		/**/
> +
> + /* ARCHNAME:
> +  *	This symbol holds a string representing the architecture name.
> diff --git a/meta/recipes-devtools/perl/perl_5.14.2.bb b/meta/recipes-devtools/perl/perl_5.14.2.bb
> index 09b2acb..d9206d8 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 = "r10"
> +PR = "r11"
>
>   # 5.10.1 has Module::Build built-in
>   PROVIDES += "libmodule-build-perl"
> @@ -66,6 +66,7 @@ SRC_URI = "http://www.cpan.org/src/5.0/perl-${PV}.tar.gz \
>           file://cross-generate_uudmap.patch \
>   	file://fix_bad_rpath.patch \
>   	file://perl-build-in-t-dir.patch \
> +	file://perl-archlib-exp.patch \
>   	\
>           file://config.sh \
>           file://config.sh-32 \
test them for qemux86 and qemuppc, the @INC path is right now.

Regards,
Kai
Tom Zanussi - Oct. 10, 2012, 3:24 a.m.
On Wed, 2012-10-10 at 11:00 +0800, Kang Kai wrote:
> On 2012?10?10? 08:48, tom.zanussi@intel.com wrote: 
> > From: Tom Zanussi <tom.zanussi@intel.com>
> > 
> > This patch uses an unmodified version of archlibexp called
> > archlib_exp, introduced by a previous patch to config.sh, which is
> > used to generate the correct value of ARCHLIB_EXP into config.h
> > 
> > Fixes [YOCTO #3099].
> > 
> > Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
> > ---
> >  .../perl/perl-5.14.2/perl-archlib-exp.patch               | 15 +++++++++++++++
> >  meta/recipes-devtools/perl/perl_5.14.2.bb                 |  3 ++-
> >  2 files changed, 17 insertions(+), 1 deletion(-)
> >  create mode 100644 meta/recipes-devtools/perl/perl-5.14.2/perl-archlib-exp.patch
> > 
> > diff --git a/meta/recipes-devtools/perl/perl-5.14.2/perl-archlib-exp.patch b/meta/recipes-devtools/perl/perl-5.14.2/perl-archlib-exp.patch
> > new file mode 100644
> > index 0000000..1c170ef
> > --- /dev/null
> > +++ b/meta/recipes-devtools/perl/perl-5.14.2/perl-archlib-exp.patch
> > @@ -0,0 +1,15 @@
> > +Upstream-Status:Inappropriate [embedded specific]
> > +
> > +Index: perl-5.14.2/config_h.SH
> > +===================================================================
> > +--- perl-5.14.2.orig/config_h.SH
> > ++++ perl-5.14.2/config_h.SH
> > +@@ -996,7 +996,7 @@ sed <<!GROK!THIS! >$CONFIG_H -e 's!^#und
> > +  *	in programs that are not prepared to deal with ~ expansion at run-time.
> > +  */
> > + #$d_archlib ARCHLIB "$archlib"		/**/
> > +-#$d_archlib ARCHLIB_EXP "$archlibexp"		/**/
> > ++#$d_archlib ARCHLIB_EXP "$archlib_exp"		/**/
> > + 
> > + /* ARCHNAME:
> > +  *	This symbol holds a string representing the architecture name.
> > diff --git a/meta/recipes-devtools/perl/perl_5.14.2.bb b/meta/recipes-devtools/perl/perl_5.14.2.bb
> > index 09b2acb..d9206d8 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 = "r10"
> > +PR = "r11"
> >  
> >  # 5.10.1 has Module::Build built-in
> >  PROVIDES += "libmodule-build-perl"
> > @@ -66,6 +66,7 @@ SRC_URI = "http://www.cpan.org/src/5.0/perl-${PV}.tar.gz \
> >          file://cross-generate_uudmap.patch \
> >  	file://fix_bad_rpath.patch \
> >  	file://perl-build-in-t-dir.patch \
> > +	file://perl-archlib-exp.patch \
> >  	\
> >          file://config.sh \
> >          file://config.sh-32 \
> test them for qemux86 and qemuppc, the @INC path is right now.
> 

Thanks for testing and verifying this, Kai.

Tom

> Regards,
> Kai
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Patch

diff --git a/meta/recipes-devtools/perl/perl-5.14.2/perl-archlib-exp.patch b/meta/recipes-devtools/perl/perl-5.14.2/perl-archlib-exp.patch
new file mode 100644
index 0000000..1c170ef
--- /dev/null
+++ b/meta/recipes-devtools/perl/perl-5.14.2/perl-archlib-exp.patch
@@ -0,0 +1,15 @@ 
+Upstream-Status:Inappropriate [embedded specific]
+
+Index: perl-5.14.2/config_h.SH
+===================================================================
+--- perl-5.14.2.orig/config_h.SH
++++ perl-5.14.2/config_h.SH
+@@ -996,7 +996,7 @@ sed <<!GROK!THIS! >$CONFIG_H -e 's!^#und
+  *	in programs that are not prepared to deal with ~ expansion at run-time.
+  */
+ #$d_archlib ARCHLIB "$archlib"		/**/
+-#$d_archlib ARCHLIB_EXP "$archlibexp"		/**/
++#$d_archlib ARCHLIB_EXP "$archlib_exp"		/**/
+ 
+ /* ARCHNAME:
+  *	This symbol holds a string representing the architecture name.
diff --git a/meta/recipes-devtools/perl/perl_5.14.2.bb b/meta/recipes-devtools/perl/perl_5.14.2.bb
index 09b2acb..d9206d8 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 = "r10"
+PR = "r11"
 
 # 5.10.1 has Module::Build built-in
 PROVIDES += "libmodule-build-perl"
@@ -66,6 +66,7 @@  SRC_URI = "http://www.cpan.org/src/5.0/perl-${PV}.tar.gz \
         file://cross-generate_uudmap.patch \
 	file://fix_bad_rpath.patch \
 	file://perl-build-in-t-dir.patch \
+	file://perl-archlib-exp.patch \
 	\
         file://config.sh \
         file://config.sh-32 \