Patchwork [13/17] perl_5.12.2.bb: Undefine features not found in uclibc

login
mail settings
Submitter Khem Raj
Date April 25, 2011, 6:55 p.m.
Message ID <e5c0091a01641a3a2b55321cf5b4a5a9e91ef8e5.1303757256.git.raj.khem@gmail.com>
Download mbox | patch
Permalink /patch/2857/
State New, archived
Headers show

Comments

Khem Raj - April 25, 2011, 6:55 p.m.
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 .../perl/perl-5.12.2/native-ssp.patch              |   16 ----------------
 meta/recipes-devtools/perl/perl_5.12.2.bb          |   16 ++++++++++++++++
 2 files changed, 16 insertions(+), 16 deletions(-)
 delete mode 100644 meta/recipes-devtools/perl/perl-5.12.2/native-ssp.patch
Saul Wold - April 26, 2011, 2:38 p.m.
On 04/25/2011 11:55 AM, Khem Raj wrote:
> Signed-off-by: Khem Raj<raj.khem@gmail.com>
> ---
>   .../perl/perl-5.12.2/native-ssp.patch              |   16 ----------------
>   meta/recipes-devtools/perl/perl_5.12.2.bb          |   16 ++++++++++++++++
>   2 files changed, 16 insertions(+), 16 deletions(-)
>   delete mode 100644 meta/recipes-devtools/perl/perl-5.12.2/native-ssp.patch
>
Khem, Nitin:

With perl being updated to 5.12.3 at this point, can you confirm this 
patch removal is still correct

Sau!

> diff --git a/meta/recipes-devtools/perl/perl-5.12.2/native-ssp.patch b/meta/recipes-devtools/perl/perl-5.12.2/native-ssp.patch
> deleted file mode 100644
> index e1e6f08..0000000
> --- a/meta/recipes-devtools/perl/perl-5.12.2/native-ssp.patch
> +++ /dev/null
> @@ -1,16 +0,0 @@
> -Upstream-Status:Inappropriate [embedded specific]
> -
> -Fix for compiling with ssp enabled gcc:
> -See http://bugs.openembedded.net/show_bug.cgi?id=1980
> -
> -diff -Naur perl-5.8.7.orig/cflags.SH perl-5.8.7/cflags.SH
> ---- perl-5.8.7.orig/cflags.SH	2002-09-30 10:59:07.000000000 +0000
> -+++ perl-5.8.7/cflags.SH	2005-10-02 04:08:39.000000000 +0000
> -@@ -165,6 +165,8 @@
> - esac
> -
> -     : Can we perhaps use $ansi2knr here
> -+    [[ $file == regcomp ]]&&  export ccflags="${ccflags} -fno-stack-protector"
> -+    [[ $file == regexec ]]&&  export ccflags="${ccflags} -fno-stack-protector"
> -     echo "$cc -c -DPERL_CORE $ccflags $optimize $warn"
> -     eval "$also "'"$cc -DPERL_CORE -c $ccflags $optimize $warn"'
> diff --git a/meta/recipes-devtools/perl/perl_5.12.2.bb b/meta/recipes-devtools/perl/perl_5.12.2.bb
> index 9ce8156..b841e7d 100644
> --- a/meta/recipes-devtools/perl/perl_5.12.2.bb
> +++ b/meta/recipes-devtools/perl/perl_5.12.2.bb
> @@ -131,6 +131,12 @@ do_configure() {
>                          -e "s,\(getnetent_r_proto=\)'\w+',\1'0',g" \
>                          -e "s,\(d_sockatmark=\)'define',\1'undef',g" \
>                          -e "s,\(d_sockatmarkproto=\)'\w+',\1'0',g" \
> +                       -e "s,\(d_eaccess=\)'define',\1'undef',g" \
> +                       -e "s,\(d_stdio_ptr_lval=\)'define',\1'undef',g" \
> +                       -e "s,\(d_stdio_ptr_lval_sets_cnt=\)'define',\1'undef',g" \
> +                       -e "s,\(d_stdiobase=\)'define',\1'undef',g" \
> +                       -e "s,\(d_stdstdio=\)'define',\1'undef',g" \
> +                       -e "s,-fstack-protector,-fno-stack-protector,g" \
>                       config.sh-${TARGET_ARCH}-${TARGET_OS}
>           fi
>
> @@ -145,6 +151,16 @@ do_configure() {
>   	       -e 's,/perl5,/perl,g' \
>               config.sh-${TARGET_ARCH}-${TARGET_OS}
>
> +       case "${TARGET_ARCH}" in
> +                x86_64 | powerpc | s390)
> +                        sed -i -e "s,\(need_va_copy=\)'undef',\1'define',g" \
> +                                config.sh-${TARGET_ARCH}-${TARGET_OS}
> +                        ;;
> +                arm)
> +                        sed -i -e "s,\(d_u32align=\)'undef',\1'define',g" \
> +                                config.sh-${TARGET_ARCH}-${TARGET_OS}
> +                        ;;
> +        esac
>           # These are strewn all over the source tree
>           for foo in `grep -I -m1 \/usr\/include\/.*\\.h ${WORKDIR}/* -r | cut -f 1 -d ":"` ; do
>               echo Fixing: $foo
Saul Wold - April 26, 2011, 4:18 p.m.
On 04/25/2011 11:55 AM, Khem Raj wrote:
> Signed-off-by: Khem Raj<raj.khem@gmail.com>
> ---
>   .../perl/perl-5.12.2/native-ssp.patch              |   16 ----------------
>   meta/recipes-devtools/perl/perl_5.12.2.bb          |   16 ++++++++++++++++
>   2 files changed, 16 insertions(+), 16 deletions(-)
>   delete mode 100644 meta/recipes-devtools/perl/perl-5.12.2/native-ssp.patch
>
Khem,

Looking further at this patch, what affects will removing these features 
have on LSB for example?

What's the bigger affect of removing the stack-protector flags, in the 
do_configure?

Sau!


> diff --git a/meta/recipes-devtools/perl/perl-5.12.2/native-ssp.patch b/meta/recipes-devtools/perl/perl-5.12.2/native-ssp.patch
> deleted file mode 100644
> index e1e6f08..0000000
> --- a/meta/recipes-devtools/perl/perl-5.12.2/native-ssp.patch
> +++ /dev/null
> @@ -1,16 +0,0 @@
> -Upstream-Status:Inappropriate [embedded specific]
> -
> -Fix for compiling with ssp enabled gcc:
> -See http://bugs.openembedded.net/show_bug.cgi?id=1980
> -
> -diff -Naur perl-5.8.7.orig/cflags.SH perl-5.8.7/cflags.SH
> ---- perl-5.8.7.orig/cflags.SH	2002-09-30 10:59:07.000000000 +0000
> -+++ perl-5.8.7/cflags.SH	2005-10-02 04:08:39.000000000 +0000
> -@@ -165,6 +165,8 @@
> - esac
> -
> -     : Can we perhaps use $ansi2knr here
> -+    [[ $file == regcomp ]]&&  export ccflags="${ccflags} -fno-stack-protector"
> -+    [[ $file == regexec ]]&&  export ccflags="${ccflags} -fno-stack-protector"
> -     echo "$cc -c -DPERL_CORE $ccflags $optimize $warn"
> -     eval "$also "'"$cc -DPERL_CORE -c $ccflags $optimize $warn"'
> diff --git a/meta/recipes-devtools/perl/perl_5.12.2.bb b/meta/recipes-devtools/perl/perl_5.12.2.bb
> index 9ce8156..b841e7d 100644
> --- a/meta/recipes-devtools/perl/perl_5.12.2.bb
> +++ b/meta/recipes-devtools/perl/perl_5.12.2.bb
> @@ -131,6 +131,12 @@ do_configure() {
>                          -e "s,\(getnetent_r_proto=\)'\w+',\1'0',g" \
>                          -e "s,\(d_sockatmark=\)'define',\1'undef',g" \
>                          -e "s,\(d_sockatmarkproto=\)'\w+',\1'0',g" \
> +                       -e "s,\(d_eaccess=\)'define',\1'undef',g" \
> +                       -e "s,\(d_stdio_ptr_lval=\)'define',\1'undef',g" \
> +                       -e "s,\(d_stdio_ptr_lval_sets_cnt=\)'define',\1'undef',g" \
> +                       -e "s,\(d_stdiobase=\)'define',\1'undef',g" \
> +                       -e "s,\(d_stdstdio=\)'define',\1'undef',g" \
> +                       -e "s,-fstack-protector,-fno-stack-protector,g" \
>                       config.sh-${TARGET_ARCH}-${TARGET_OS}
>           fi
>
> @@ -145,6 +151,16 @@ do_configure() {
>   	       -e 's,/perl5,/perl,g' \
>               config.sh-${TARGET_ARCH}-${TARGET_OS}
>
> +       case "${TARGET_ARCH}" in
> +                x86_64 | powerpc | s390)
> +                        sed -i -e "s,\(need_va_copy=\)'undef',\1'define',g" \
> +                                config.sh-${TARGET_ARCH}-${TARGET_OS}
> +                        ;;
> +                arm)
> +                        sed -i -e "s,\(d_u32align=\)'undef',\1'define',g" \
> +                                config.sh-${TARGET_ARCH}-${TARGET_OS}
> +                        ;;
> +        esac
>           # These are strewn all over the source tree
>           for foo in `grep -I -m1 \/usr\/include\/.*\\.h ${WORKDIR}/* -r | cut -f 1 -d ":"` ; do
>               echo Fixing: $foo
Khem Raj - April 26, 2011, 5:47 p.m.
On Tue, Apr 26, 2011 at 9:18 AM, Saul Wold <sgw@linux.intel.com> wrote:
> On 04/25/2011 11:55 AM, Khem Raj wrote:
>>
>> Signed-off-by: Khem Raj<raj.khem@gmail.com>
>> ---
>>  .../perl/perl-5.12.2/native-ssp.patch              |   16
>> ----------------
>>  meta/recipes-devtools/perl/perl_5.12.2.bb          |   16
>> ++++++++++++++++
>>  2 files changed, 16 insertions(+), 16 deletions(-)
>>  delete mode 100644
>> meta/recipes-devtools/perl/perl-5.12.2/native-ssp.patch
>>
> Khem,
>
> Looking further at this patch, what affects will removing these features
> have on LSB for example?
>
> What's the bigger affect of removing the stack-protector flags, in the
> do_configure?
>

No effect. Patch was not applied. It is useless to keep unapplied
patches. and the real changes are only for uclibc based targets
so it has no effect for eglibc builds

> Sau!
>
>
>> diff --git a/meta/recipes-devtools/perl/perl-5.12.2/native-ssp.patch
>> b/meta/recipes-devtools/perl/perl-5.12.2/native-ssp.patch
>> deleted file mode 100644
>> index e1e6f08..0000000
>> --- a/meta/recipes-devtools/perl/perl-5.12.2/native-ssp.patch
>> +++ /dev/null
>> @@ -1,16 +0,0 @@
>> -Upstream-Status:Inappropriate [embedded specific]
>> -
>> -Fix for compiling with ssp enabled gcc:
>> -See http://bugs.openembedded.net/show_bug.cgi?id=1980
>> -
>> -diff -Naur perl-5.8.7.orig/cflags.SH perl-5.8.7/cflags.SH
>> ---- perl-5.8.7.orig/cflags.SH  2002-09-30 10:59:07.000000000 +0000
>> -+++ perl-5.8.7/cflags.SH       2005-10-02 04:08:39.000000000 +0000
>> -@@ -165,6 +165,8 @@
>> - esac
>> -
>> -     : Can we perhaps use $ansi2knr here
>> -+    [[ $file == regcomp ]]&&  export ccflags="${ccflags}
>> -fno-stack-protector"
>> -+    [[ $file == regexec ]]&&  export ccflags="${ccflags}
>> -fno-stack-protector"
>> -     echo "$cc -c -DPERL_CORE $ccflags $optimize $warn"
>> -     eval "$also "'"$cc -DPERL_CORE -c $ccflags $optimize $warn"'
>> diff --git a/meta/recipes-devtools/perl/perl_5.12.2.bb
>> b/meta/recipes-devtools/perl/perl_5.12.2.bb
>> index 9ce8156..b841e7d 100644
>> --- a/meta/recipes-devtools/perl/perl_5.12.2.bb
>> +++ b/meta/recipes-devtools/perl/perl_5.12.2.bb
>> @@ -131,6 +131,12 @@ do_configure() {
>>                         -e "s,\(getnetent_r_proto=\)'\w+',\1'0',g" \
>>                         -e "s,\(d_sockatmark=\)'define',\1'undef',g" \
>>                         -e "s,\(d_sockatmarkproto=\)'\w+',\1'0',g" \
>> +                       -e "s,\(d_eaccess=\)'define',\1'undef',g" \
>> +                       -e "s,\(d_stdio_ptr_lval=\)'define',\1'undef',g" \
>> +                       -e
>> "s,\(d_stdio_ptr_lval_sets_cnt=\)'define',\1'undef',g" \
>> +                       -e "s,\(d_stdiobase=\)'define',\1'undef',g" \
>> +                       -e "s,\(d_stdstdio=\)'define',\1'undef',g" \
>> +                       -e "s,-fstack-protector,-fno-stack-protector,g" \
>>                      config.sh-${TARGET_ARCH}-${TARGET_OS}
>>          fi
>>
>> @@ -145,6 +151,16 @@ do_configure() {
>>               -e 's,/perl5,/perl,g' \
>>              config.sh-${TARGET_ARCH}-${TARGET_OS}
>>
>> +       case "${TARGET_ARCH}" in
>> +                x86_64 | powerpc | s390)
>> +                        sed -i -e
>> "s,\(need_va_copy=\)'undef',\1'define',g" \
>> +                                config.sh-${TARGET_ARCH}-${TARGET_OS}
>> +                        ;;
>> +                arm)
>> +                        sed -i -e "s,\(d_u32align=\)'undef',\1'define',g"
>> \
>> +                                config.sh-${TARGET_ARCH}-${TARGET_OS}
>> +                        ;;
>> +        esac
>>          # These are strewn all over the source tree
>>          for foo in `grep -I -m1 \/usr\/include\/.*\\.h ${WORKDIR}/* -r |
>> cut -f 1 -d ":"` ; do
>>              echo Fixing: $foo
>

Patch

diff --git a/meta/recipes-devtools/perl/perl-5.12.2/native-ssp.patch b/meta/recipes-devtools/perl/perl-5.12.2/native-ssp.patch
deleted file mode 100644
index e1e6f08..0000000
--- a/meta/recipes-devtools/perl/perl-5.12.2/native-ssp.patch
+++ /dev/null
@@ -1,16 +0,0 @@ 
-Upstream-Status:Inappropriate [embedded specific]
-
-Fix for compiling with ssp enabled gcc:
-See http://bugs.openembedded.net/show_bug.cgi?id=1980
-
-diff -Naur perl-5.8.7.orig/cflags.SH perl-5.8.7/cflags.SH
---- perl-5.8.7.orig/cflags.SH	2002-09-30 10:59:07.000000000 +0000
-+++ perl-5.8.7/cflags.SH	2005-10-02 04:08:39.000000000 +0000
-@@ -165,6 +165,8 @@
- esac
- 
-     : Can we perhaps use $ansi2knr here
-+    [[ $file == regcomp ]] && export ccflags="${ccflags} -fno-stack-protector"
-+    [[ $file == regexec ]] && export ccflags="${ccflags} -fno-stack-protector"
-     echo "$cc -c -DPERL_CORE $ccflags $optimize $warn"
-     eval "$also "'"$cc -DPERL_CORE -c $ccflags $optimize $warn"'
diff --git a/meta/recipes-devtools/perl/perl_5.12.2.bb b/meta/recipes-devtools/perl/perl_5.12.2.bb
index 9ce8156..b841e7d 100644
--- a/meta/recipes-devtools/perl/perl_5.12.2.bb
+++ b/meta/recipes-devtools/perl/perl_5.12.2.bb
@@ -131,6 +131,12 @@  do_configure() {
                        -e "s,\(getnetent_r_proto=\)'\w+',\1'0',g" \
                        -e "s,\(d_sockatmark=\)'define',\1'undef',g" \
                        -e "s,\(d_sockatmarkproto=\)'\w+',\1'0',g" \
+                       -e "s,\(d_eaccess=\)'define',\1'undef',g" \
+                       -e "s,\(d_stdio_ptr_lval=\)'define',\1'undef',g" \
+                       -e "s,\(d_stdio_ptr_lval_sets_cnt=\)'define',\1'undef',g" \
+                       -e "s,\(d_stdiobase=\)'define',\1'undef',g" \
+                       -e "s,\(d_stdstdio=\)'define',\1'undef',g" \
+                       -e "s,-fstack-protector,-fno-stack-protector,g" \
                     config.sh-${TARGET_ARCH}-${TARGET_OS}
         fi
 
@@ -145,6 +151,16 @@  do_configure() {
 	       -e 's,/perl5,/perl,g' \
             config.sh-${TARGET_ARCH}-${TARGET_OS}
 
+       case "${TARGET_ARCH}" in                                                                      
+                x86_64 | powerpc | s390)                                                              
+                        sed -i -e "s,\(need_va_copy=\)'undef',\1'define',g" \                         
+                                config.sh-${TARGET_ARCH}-${TARGET_OS}                                 
+                        ;;                                                                            
+                arm)                                                                                  
+                        sed -i -e "s,\(d_u32align=\)'undef',\1'define',g" \                           
+                                config.sh-${TARGET_ARCH}-${TARGET_OS}                                 
+                        ;;                                                                            
+        esac                                                                                          
         # These are strewn all over the source tree
         for foo in `grep -I -m1 \/usr\/include\/.*\\.h ${WORKDIR}/* -r | cut -f 1 -d ":"` ; do
             echo Fixing: $foo