diff options
author | Nitin A Kamble <nitin.a.kamble@intel.com> | 2010-12-22 09:26:07 -0800 |
---|---|---|
committer | Saul Wold <sgw@linux.intel.com> | 2011-01-12 00:55:48 -0800 |
commit | f57e9daf74d5fbab6c9a3f5e60e1320a0bf0642d (patch) | |
tree | f6b24ea8f39fd6c83a161f91117641a851c4a9c6 /meta/recipes-devtools/perl/perl-5.12.2/debian/fixes/h2ph-gcc-4.5.diff | |
parent | fde91acaf7849d80a2b9c908398bee2c3452004e (diff) | |
download | openembedded-core-f57e9daf74d5fbab6c9a3f5e60e1320a0bf0642d.tar.gz openembedded-core-f57e9daf74d5fbab6c9a3f5e60e1320a0bf0642d.tar.bz2 openembedded-core-f57e9daf74d5fbab6c9a3f5e60e1320a0bf0642d.tar.xz openembedded-core-f57e9daf74d5fbab6c9a3f5e60e1320a0bf0642d.zip |
perl, perl-native: upgrade from 5.8.8 to 5.12.2
Deleted these patches as they are part of the upstream code now.
deleted: files/perl-5.8.8-gcc-4.2.patch
deleted: perl-5.12.2/makedepend-dash.patch
deleted: perl-5.12.2/native-no-gdbminc.patch
deleted: perl-5.12.2/54_debian_perldoc-r.patch
And rebased these patches to the newer source code
modified: files/letgcc-find-errno.patch
modified: perl-5.12.2/Makefile.patch
modified: perl-5.12.2/asm-pageh-fix.patch
modified: perl-5.12.2/native-nopacklist.patch
modified: perl-5.12.2/native-perlinc.patch
modified: perl-5.12.2/Makefile.SH.patch
modified: perl-5.12.2/installperl.patch
modified: perl-5.12.2/perl-dynloader.patch
modified: perl-5.12.2/09_fix_installperl.patch
get patches from debian perl ver 5.12.2-2
the fakeroot.diff patch from debian is conflicting with our
Makefile.SH.patch, hence disabling the fakeroot patch
use newly created config files
Created with current milestone branch on qemu machines
modified: config.sh
modified: config.sh-32
modified: config.sh-64
get some changes from oe's perl 5.10.1 recipe
fix the Makefile.SH.patch use miniperl instead of perl
import a OE 5.10.1 patch: uudmap_cross
fix install issues
add /usr in the destdir, so that perl gets installed in
/usr/bin/perl and not in /bin/perl
link /usr/lib/perl to /usr/lib/perl5 so that operations with
/usr/lib/perl path in them keep on working.
Fix/Improve perl packaging
avoid perl-module-module-* kind of packages
recreate perl-rdepends_5.12.2.inc file with new set of packages
import from oe perl-rprovide_5.12.2.inc
combine all unicore perl scripts in one package
simplify perl-lib
reduce no of perl recipe packages greatly.
Add zlib to depedancy
fix buildtime host contamination
This also fixes [BUGID #384]
Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
Diffstat (limited to 'meta/recipes-devtools/perl/perl-5.12.2/debian/fixes/h2ph-gcc-4.5.diff')
-rw-r--r-- | meta/recipes-devtools/perl/perl-5.12.2/debian/fixes/h2ph-gcc-4.5.diff | 106 |
1 files changed, 106 insertions, 0 deletions
diff --git a/meta/recipes-devtools/perl/perl-5.12.2/debian/fixes/h2ph-gcc-4.5.diff b/meta/recipes-devtools/perl/perl-5.12.2/debian/fixes/h2ph-gcc-4.5.diff new file mode 100644 index 000000000..c2baf2fa7 --- /dev/null +++ b/meta/recipes-devtools/perl/perl-5.12.2/debian/fixes/h2ph-gcc-4.5.diff @@ -0,0 +1,106 @@ +Author: Robin Barker <rmbarker@cpan.org> +Subject: h2ph fix for gcc 4.5 +Bug-Debian: http://bugs.debian.org/599933 +Origin: upstream, http://perl5.git.perl.org/perl.git/commit/8d66b3f930dc6d88b524d103e304308ae73a46e7 + +Fix h2ph and test. Needed to build with GCC 4.5. + + +--- + lib/h2ph.t | 12 ++++++++++-- + utils/h2ph.PL | 28 +++++++++++++++++++++++----- + 2 files changed, 33 insertions(+), 7 deletions(-) + +diff --git a/lib/h2ph.t b/lib/h2ph.t +index 27dd7b9..8d62d46 100755 +--- a/lib/h2ph.t ++++ b/lib/h2ph.t +@@ -18,7 +18,7 @@ if (!(-e $extracted_program)) { + exit 0; + } + +-plan(4); ++plan(5); + + # quickly compare two text files + sub txt_compare { +@@ -41,8 +41,16 @@ $result = runperl( progfile => 'lib/h2ph.pht', + stderr => 1 ); + like( $result, qr/syntax OK$/, "output compiles"); + ++$result = runperl( progfile => '_h2ph_pre.ph', ++ switches => ['-c'], ++ stderr => 1 ); ++like( $result, qr/syntax OK$/, "preamble compiles"); ++ + $result = runperl( switches => ["-w"], +- prog => '$SIG{__WARN__} = sub { die $_[0] }; require q(lib/h2ph.pht);'); ++ stderr => 1, ++ prog => <<'PROG' ); ++$SIG{__WARN__} = sub { die $_[0] }; require q(lib/h2ph.pht); ++PROG + is( $result, '', "output free of warnings" ); + + # cleanup +diff --git a/utils/h2ph.PL b/utils/h2ph.PL +index 8f56db4..1255807 100644 +--- a/utils/h2ph.PL ++++ b/utils/h2ph.PL +@@ -401,7 +401,10 @@ if ($opt_e && (scalar(keys %bad_file) > 0)) { + exit $Exit; + + sub expr { +- $new = '"(assembly code)"' and return if /\b__asm__\b/; # freak out. ++ if (/\b__asm__\b/) { # freak out ++ $new = '"(assembly code)"'; ++ return ++ } + my $joined_args; + if(keys(%curargs)) { + $joined_args = join('|', keys(%curargs)); +@@ -770,7 +773,7 @@ sub inc_dirs + sub build_preamble_if_necessary + { + # Increment $VERSION every time this function is modified: +- my $VERSION = 2; ++ my $VERSION = 3; + my $preamble = "$Dest_dir/_h2ph_pre.ph"; + + # Can we skip building the preamble file? +@@ -798,7 +801,16 @@ sub build_preamble_if_necessary + # parenthesized value: d=(v) + $define{$_} = $1; + } +- if ($define{$_} =~ /^([+-]?(\d+)?\.\d+([eE][+-]?\d+)?)[FL]?$/) { ++ if (/^(\w+)\((\w)\)$/) { ++ my($macro, $arg) = ($1, $2); ++ my $def = $define{$_}; ++ $def =~ s/$arg/\$\{$arg\}/g; ++ print PREAMBLE <<DEFINE; ++unless (defined &$macro) { sub $macro(\$) { my (\$$arg) = \@_; \"$def\" } } ++ ++DEFINE ++ } elsif ++ ($define{$_} =~ /^([+-]?(\d+)?\.\d+([eE][+-]?\d+)?)[FL]?$/) { + # float: + print PREAMBLE + "unless (defined &$_) { sub $_() { $1 } }\n\n"; +@@ -807,8 +819,14 @@ sub build_preamble_if_necessary + print PREAMBLE + "unless (defined &$_) { sub $_() { $1 } }\n\n"; + } elsif ($define{$_} =~ /^\w+$/) { +- print PREAMBLE +- "unless (defined &$_) { sub $_() { &$define{$_} } }\n\n"; ++ my $def = $define{$_}; ++ if ($isatype{$def}) { ++ print PREAMBLE ++ "unless (defined &$_) { sub $_() { \"$def\" } }\n\n"; ++ } else { ++ print PREAMBLE ++ "unless (defined &$_) { sub $_() { &$def } }\n\n"; ++ } + } else { + print PREAMBLE + "unless (defined &$_) { sub $_() { \"", +-- +tg: (c823880..) fixes/h2ph-gcc-4.5 (depends on: upstream) |