summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/perl
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2018-03-08 20:18:03 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-03-09 09:17:04 -0800
commitb2f7a5fbf57b8398b1eb46771a3538bae4f88dcd (patch)
tree6f7acb5e40e5455829d2ee4a55f161380c57bf28 /meta/recipes-devtools/perl
parentfe9e4bbee7e079bfd2bc1e8fa6124ef2db2d2efe (diff)
downloadpoky-b2f7a5fbf57b8398b1eb46771a3538bae4f88dcd.tar.gz
perl: refresh patches
The patch tool will apply patches by default with "fuzz", which is where if the hunk context isn't present but what is there is close enough, it will force the patch in. Whilst this is useful when there's just whitespace changes, when applied to source it is possible for a patch applied with fuzz to produce broken code which still compiles (see #10450). This is obviously bad. We'd like to eventually have do_patch() rejecting any fuzz on these grounds. For that to be realistic the existing patches with fuzz need to be rebased and reviewed. (From OE-Core rev: ddb2be68c713361b1024b33080bf7c160337dbe1) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/perl')
-rw-r--r--meta/recipes-devtools/perl/perl/Makefile.SH.patch44
-rw-r--r--meta/recipes-devtools/perl/perl/cross-generate_uudmap.patch14
-rw-r--r--meta/recipes-devtools/perl/perl/fix_bad_rpath.patch12
-rw-r--r--meta/recipes-devtools/perl/perl/installperl.patch12
-rw-r--r--meta/recipes-devtools/perl/perl/make_ext.pl-fix-regenerate-makefile-failed-while-cc-.patch13
-rw-r--r--meta/recipes-devtools/perl/perl/perl-archlib-exp.patch12
-rw-r--r--meta/recipes-devtools/perl/perl/perl-dynloader.patch14
-rw-r--r--meta/recipes-devtools/perl/perl/perl-enable-gdbm.patch10
8 files changed, 63 insertions, 68 deletions
diff --git a/meta/recipes-devtools/perl/perl/Makefile.SH.patch b/meta/recipes-devtools/perl/perl/Makefile.SH.patch
index fd8237fe79..c1db335e0d 100644
--- a/meta/recipes-devtools/perl/perl/Makefile.SH.patch
+++ b/meta/recipes-devtools/perl/perl/Makefile.SH.patch
@@ -12,10 +12,10 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
12 Makefile.SH | 147 ++++++++++++++++++++++++++++-------------------------------- 12 Makefile.SH | 147 ++++++++++++++++++++++++++++--------------------------------
13 1 file changed, 68 insertions(+), 79 deletions(-) 13 1 file changed, 68 insertions(+), 79 deletions(-)
14 14
15diff --git a/Makefile.SH b/Makefile.SH 15Index: perl-5.24.1/Makefile.SH
16index 916b332..b143d46 100755 16===================================================================
17--- a/Makefile.SH 17--- perl-5.24.1.orig/Makefile.SH
18+++ b/Makefile.SH 18+++ perl-5.24.1/Makefile.SH
19@@ -48,10 +48,10 @@ case "$useshrplib" in 19@@ -48,10 +48,10 @@ case "$useshrplib" in
20 true) 20 true)
21 # Prefix all runs of 'miniperl' and 'perl' with 21 # Prefix all runs of 'miniperl' and 'perl' with
@@ -74,6 +74,10 @@ index 916b332..b143d46 100755
74-all: $(FIRSTMAKEFILE) $(MINIPERL_EXE) $(generated_pods) $(private) $(unidatafiles) $(public) $(dynamic_ext) $(nonxs_ext) extras.make $(MANIFEST_SRT) 74-all: $(FIRSTMAKEFILE) $(MINIPERL_EXE) $(generated_pods) $(private) $(unidatafiles) $(public) $(dynamic_ext) $(nonxs_ext) extras.make $(MANIFEST_SRT)
75- @echo " "; 75- @echo " ";
76- @echo " Everything is up to date. Type '$(MAKE) test' to run test suite." 76- @echo " Everything is up to date. Type '$(MAKE) test' to run test suite."
77-
78-$(MANIFEST_SRT): MANIFEST $(PERL_EXE)
79- @$(RUN_PERL) Porting/manisort -q || (echo "WARNING: re-sorting MANIFEST"; \
80- $(RUN_PERL) Porting/manisort -q -o MANIFEST; sh -c true)
77+#all: $(FIRSTMAKEFILE) $(MINIPERL_EXE) $(generated_pods) $(private) $(unidatafiles) $(public) $(dynamic_ext) $(nonxs_ext) extras.make $(MANIFEST_SRT) 81+#all: $(FIRSTMAKEFILE) $(MINIPERL_EXE) $(generated_pods) $(private) $(unidatafiles) $(public) $(dynamic_ext) $(nonxs_ext) extras.make $(MANIFEST_SRT)
78+# @echo " "; 82+# @echo " ";
79+# @echo " Everything is up to date. Type '$(MAKE) test' to run test suite." 83+# @echo " Everything is up to date. Type '$(MAKE) test' to run test suite."
@@ -83,10 +87,7 @@ index 916b332..b143d46 100755
83+more: $(generated_pods) $(private) $(public) 87+more: $(generated_pods) $(private) $(public)
84+ 88+
85+more2: $(dynamic_ext) 89+more2: $(dynamic_ext)
86 90+
87-$(MANIFEST_SRT): MANIFEST $(PERL_EXE)
88- @$(RUN_PERL) Porting/manisort -q || (echo "WARNING: re-sorting MANIFEST"; \
89- $(RUN_PERL) Porting/manisort -q -o MANIFEST; sh -c true)
90+more3: $(nonxs_ext) 91+more3: $(nonxs_ext)
91+ 92+
92+more4: extras.make $(MANIFEST_SRT) 93+more4: extras.make $(MANIFEST_SRT)
@@ -151,7 +152,7 @@ index 916b332..b143d46 100755
151 ./$(MINIPERLEXP) makedef.pl PLATFORM=os2 -DPERL_DLL=$(PERL_DLL) CC_FLAGS="$(OPTIMIZE)" > perl5.def 152 ./$(MINIPERLEXP) makedef.pl PLATFORM=os2 -DPERL_DLL=$(PERL_DLL) CC_FLAGS="$(OPTIMIZE)" > perl5.def
152 153
153 !NO!SUBS! 154 !NO!SUBS!
154@@ -878,7 +878,7 @@ $(LIBPERL): $& $(perllib_objs) $(DYNALOADER) $(LIBPERLEXPORT) 155@@ -878,7 +878,7 @@ $(LIBPERL): $& $(perllib_objs) $(DYNALOA
155 true) 156 true)
156 $spitshell >>$Makefile <<'!NO!SUBS!' 157 $spitshell >>$Makefile <<'!NO!SUBS!'
157 rm -f $@ 158 rm -f $@
@@ -160,7 +161,7 @@ index 916b332..b143d46 100755
160 !NO!SUBS! 161 !NO!SUBS!
161 case "$osname" in 162 case "$osname" in
162 aix) 163 aix)
163@@ -936,15 +936,19 @@ lib/buildcustomize.pl: $& $(miniperl_objs) write_buildcustomize.pl 164@@ -936,15 +936,19 @@ lib/buildcustomize.pl: $& $(miniperl_obj
164 $spitshell >>$Makefile <<'!NO!SUBS!' 165 $spitshell >>$Makefile <<'!NO!SUBS!'
165 lib/buildcustomize.pl: $& $(miniperl_objs) 166 lib/buildcustomize.pl: $& $(miniperl_objs)
166 $(CC) -o $(MINIPERL_EXE) $(CLDFLAGS) $(miniperl_objs) $(libs) 167 $(CC) -o $(MINIPERL_EXE) $(CLDFLAGS) $(miniperl_objs) $(libs)
@@ -183,7 +184,7 @@ index 916b332..b143d46 100755
183 $(MINIPERL) -f write_buildcustomize.pl 184 $(MINIPERL) -f write_buildcustomize.pl
184 !NO!SUBS! 185 !NO!SUBS!
185 ;; 186 ;;
186@@ -966,7 +970,9 @@ lib/buildcustomize.pl: $& $(miniperl_objs) write_buildcustomize.pl 187@@ -966,7 +970,9 @@ lib/buildcustomize.pl: $& $(miniperl_obj
187 -@rm -f miniperl.xok 188 -@rm -f miniperl.xok
188 $(CC) $(CLDFLAGS) $(NAMESPACEFLAGS) -o $(MINIPERL_EXE) \ 189 $(CC) $(CLDFLAGS) $(NAMESPACEFLAGS) -o $(MINIPERL_EXE) \
189 $(miniperl_objs) $(libs) 190 $(miniperl_objs) $(libs)
@@ -194,7 +195,7 @@ index 916b332..b143d46 100755
194 $(MINIPERL) -f write_buildcustomize.pl 195 $(MINIPERL) -f write_buildcustomize.pl
195 !NO!SUBS! 196 !NO!SUBS!
196 ;; 197 ;;
197@@ -977,7 +983,9 @@ lib/buildcustomize.pl: \$& \$(miniperl_objs) write_buildcustomize.pl 198@@ -977,7 +983,9 @@ lib/buildcustomize.pl: \$& \$(miniperl_o
198 -@rm -f miniperl.xok 199 -@rm -f miniperl.xok
199 -@rm \$(MINIPERL_EXE) 200 -@rm \$(MINIPERL_EXE)
200 \$(LNS) \$(HOST_PERL) \$(MINIPERL_EXE) 201 \$(LNS) \$(HOST_PERL) \$(MINIPERL_EXE)
@@ -205,7 +206,7 @@ index 916b332..b143d46 100755
205 \$(MINIPERL) -f write_buildcustomize.pl 'osname' "$osname" 206 \$(MINIPERL) -f write_buildcustomize.pl 'osname' "$osname"
206 !GROK!THIS! 207 !GROK!THIS!
207 else 208 else
208@@ -986,7 +994,9 @@ lib/buildcustomize.pl: $& $(miniperl_objs) write_buildcustomize.pl 209@@ -986,7 +994,9 @@ lib/buildcustomize.pl: $& $(miniperl_obj
209 -@rm -f miniperl.xok 210 -@rm -f miniperl.xok
210 $(CC) $(CLDFLAGS) -o $(MINIPERL_EXE) \ 211 $(CC) $(CLDFLAGS) -o $(MINIPERL_EXE) \
211 $(miniperl_objs) $(libs) 212 $(miniperl_objs) $(libs)
@@ -225,7 +226,7 @@ index 916b332..b143d46 100755
225 -@for f in Makefile.PL PPPort_pm.PL PPPort_xs.PL ppport_h.PL; do \ 226 -@for f in Makefile.PL PPPort_pm.PL PPPort_xs.PL ppport_h.PL; do \
226 (cd ext/Devel-PPPort && `pwd`/run.sh ../../$(MINIPERL_EXE) -I../../lib \$\$f); \ 227 (cd ext/Devel-PPPort && `pwd`/run.sh ../../$(MINIPERL_EXE) -I../../lib \$\$f); \
227 done 228 done
228@@ -1046,7 +1056,7 @@ makeppport: \$(MINIPERL_EXE) \$(CONFIGPM) 229@@ -1046,7 +1056,7 @@ makeppport: \$(MINIPERL_EXE) \$(CONFIGPM
229 *) 230 *)
230 $spitshell >>$Makefile <<'!NO!SUBS!' 231 $spitshell >>$Makefile <<'!NO!SUBS!'
231 .PHONY: makeppport 232 .PHONY: makeppport
@@ -254,7 +255,7 @@ index 916b332..b143d46 100755
254 $(MINIPERL) lib/unicore/mktables -C lib/unicore -P pod -maketest -makelist -p 255 $(MINIPERL) lib/unicore/mktables -C lib/unicore -P pod -maketest -makelist -p
255 # Commented out so always runs, mktables looks at far more files than we 256 # Commented out so always runs, mktables looks at far more files than we
256 # can in this makefile to decide if needs to run or not 257 # can in this makefile to decide if needs to run or not
257@@ -1074,12 +1084,12 @@ uni.data: $(MINIPERL_EXE) $(CONFIGPM) lib/unicore/mktables $(nonxs_ext) 258@@ -1074,12 +1084,12 @@ uni.data: $(MINIPERL_EXE) $(CONFIGPM) li
258 # $(PERL_EXE) and ext because pod_lib.pl needs Digest::MD5 259 # $(PERL_EXE) and ext because pod_lib.pl needs Digest::MD5
259 # But also this ensures that all extensions are built before we try to scan 260 # But also this ensures that all extensions are built before we try to scan
260 # them, which picks up Devel::PPPort's documentation. 261 # them, which picks up Devel::PPPort's documentation.
@@ -270,9 +271,9 @@ index 916b332..b143d46 100755
270 $(MINIPERL) autodoc.pl 271 $(MINIPERL) autodoc.pl
271 272
272 pod/perlmodlib.pod: $(MINIPERL_EXE) pod/perlmodlib.PL MANIFEST 273 pod/perlmodlib.pod: $(MINIPERL_EXE) pod/perlmodlib.PL MANIFEST
273@@ -1089,7 +1099,7 @@ pod/perl5240delta.pod: pod/perldelta.pod 274@@ -1089,7 +1099,7 @@ pod/perl5241delta.pod: pod/perldelta.pod
274 $(RMS) pod/perl5240delta.pod 275 $(RMS) pod/perl5241delta.pod
275 $(LNS) perldelta.pod pod/perl5240delta.pod 276 $(LNS) perldelta.pod pod/perl5241delta.pod
276 277
277-extra.pods: $(MINIPERL_EXE) 278-extra.pods: $(MINIPERL_EXE)
278+extra.pods: 279+extra.pods:
@@ -345,7 +346,7 @@ index 916b332..b143d46 100755
345 $(MINIPERL) make_ext.pl $@ $(MAKE_EXT_ARGS) MAKE="$(MAKE)" LIBPERL_A=$(LIBPERL) LINKTYPE=static $(STATIC_LDFLAGS) 346 $(MINIPERL) make_ext.pl $@ $(MAKE_EXT_ARGS) MAKE="$(MAKE)" LIBPERL_A=$(LIBPERL) LINKTYPE=static $(STATIC_LDFLAGS)
346 347
347 n_dummy $(nonxs_ext): $(MINIPERL_EXE) lib/buildcustomize.pl preplibrary FORCE 348 n_dummy $(nonxs_ext): $(MINIPERL_EXE) lib/buildcustomize.pl preplibrary FORCE
348@@ -1479,14 +1468,14 @@ test_prep_pre: preplibrary utilities $(nonxs_ext) 349@@ -1479,14 +1468,14 @@ test_prep_pre: preplibrary utilities $(n
349 350
350 case "$targethost" in 351 case "$targethost" in
351 '') $spitshell >>$Makefile <<'!NO!SUBS!' 352 '') $spitshell >>$Makefile <<'!NO!SUBS!'
@@ -362,7 +363,7 @@ index 916b332..b143d46 100755
362 \$(dynamic_ext) \$(TEST_PERL_DLL) runtests \ 363 \$(dynamic_ext) \$(TEST_PERL_DLL) runtests \
363 \$(generated_pods) 364 \$(generated_pods)
364 $to libperl.* 365 $to libperl.*
365@@ -1539,7 +1528,7 @@ test_prep test-prep: test_prep_pre \$(MINIPERL_EXE) \$(unidatafiles) \$(PERL_EXE 366@@ -1539,7 +1528,7 @@ test_prep test-prep: test_prep_pre \$(MI
366 esac 367 esac
367 368
368 $spitshell >>$Makefile <<'!NO!SUBS!' 369 $spitshell >>$Makefile <<'!NO!SUBS!'
@@ -380,6 +381,3 @@ index 916b332..b143d46 100755
380 - cd t && $(RUN_PERL) TEST $(MINITEST_TESTS) <$(devtty) 381 - cd t && $(RUN_PERL) TEST $(MINITEST_TESTS) <$(devtty)
381 382
382 minitest-notty minitest_notty: $(MINIPERL_EXE) minitest_prep 383 minitest-notty minitest_notty: $(MINIPERL_EXE) minitest_prep
383--
3842.1.4
385
diff --git a/meta/recipes-devtools/perl/perl/cross-generate_uudmap.patch b/meta/recipes-devtools/perl/perl/cross-generate_uudmap.patch
index a00ad61d90..33e222259f 100644
--- a/meta/recipes-devtools/perl/perl/cross-generate_uudmap.patch
+++ b/meta/recipes-devtools/perl/perl/cross-generate_uudmap.patch
@@ -1,15 +1,15 @@
1Upstream-Status:Inappropriate [embedded specific] 1Upstream-Status:Inappropriate [embedded specific]
2 2
3Index: perl-5.14.2/Makefile.SH 3Index: perl-5.24.1/Makefile.SH
4=================================================================== 4===================================================================
5--- perl-5.14.2.orig/Makefile.SH 5--- perl-5.24.1.orig/Makefile.SH
6+++ perl-5.14.2/Makefile.SH 6+++ perl-5.24.1/Makefile.SH
7@@ -622,7 +622,7 @@ bitcount.h: generate_uudmap$(HOST_EXE_EX 7@@ -710,7 +710,7 @@ bitcount.h: generate_uudmap\$(HOST_EXE_E
8 $(RUN) ./generate_uudmap$(HOST_EXE_EXT) uudmap.h bitcount.h
9 8
9 $spitshell >>$Makefile <<'!NO!SUBS!'
10 generate_uudmap$(HOST_EXE_EXT): generate_uudmap$(OBJ_EXT) 10 generate_uudmap$(HOST_EXE_EXT): generate_uudmap$(OBJ_EXT)
11- $(CC) -o generate_uudmap$(EXE_EXT) $(LDFLAGS) generate_uudmap$(OBJ_EXT) $(libs) 11- $(CC) -o generate_uudmap$(EXE_EXT) $(LDFLAGS) generate_uudmap$(OBJ_EXT) $(libs)
12+ $(BUILD_CC) -o generate_uudmap$(EXE_EXT) generate_uudmap.c 12+ $(BUILD_CC) -o generate_uudmap$(EXE_EXT) generate_uudmap.c
13 13
14 miniperlmain$(OBJ_EXT): miniperlmain.c patchlevel.h 14 !NO!SUBS!
15 $(CCCMD) $(PLDLFLAGS) $*.c 15 ;;
diff --git a/meta/recipes-devtools/perl/perl/fix_bad_rpath.patch b/meta/recipes-devtools/perl/perl/fix_bad_rpath.patch
index 76501283ed..49efcbeefc 100644
--- a/meta/recipes-devtools/perl/perl/fix_bad_rpath.patch
+++ b/meta/recipes-devtools/perl/perl/fix_bad_rpath.patch
@@ -10,15 +10,15 @@ This fixes this warning for perl recipe as well as libxml-parser-perl recipe.
10It is a fix to MakeMaker within perl, so all such perl recipes will get 10It is a fix to MakeMaker within perl, so all such perl recipes will get
11fixed with this perl fix. 11fixed with this perl fix.
12 12
13Index: perl-5.14.2/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm 13Index: perl-5.24.1/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm
14=================================================================== 14===================================================================
15--- perl-5.14.2.orig/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm 15--- perl-5.24.1.orig/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm
16+++ perl-5.14.2/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm 16+++ perl-5.24.1/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm
17@@ -55,6 +55,7 @@ sub _unix_os2_ext { 17@@ -57,6 +57,7 @@ sub _unix_os2_ext {
18 my($found) = 0; 18 my ( $found ) = 0;
19 19
20 # Debian-specific: don't use LD_RUN_PATH for standard dirs 20 # Debian-specific: don't use LD_RUN_PATH for standard dirs
21+ push(@libpath, "SYSROOTLIB"); 21+ push(@libpath, "SYSROOTLIB");
22 $ld_run_path_seen{$_}++ for @libpath; 22 $ld_run_path_seen{$_}++ for @libpath;
23 23
24 foreach my $thislib (split ' ', $potential_libs) { 24 foreach my $thislib ( split ' ', $potential_libs ) {
diff --git a/meta/recipes-devtools/perl/perl/installperl.patch b/meta/recipes-devtools/perl/perl/installperl.patch
index 456012376e..7fd1f50144 100644
--- a/meta/recipes-devtools/perl/perl/installperl.patch
+++ b/meta/recipes-devtools/perl/perl/installperl.patch
@@ -1,12 +1,12 @@
1Upstream-Status:Inappropriate [embedded specific] 1Upstream-Status:Inappropriate [embedded specific]
2 2
3Index: perl-5.12.3/installperl 3Index: perl-5.24.1/installperl
4=================================================================== 4===================================================================
5--- perl-5.12.3.orig/installperl 5--- perl-5.24.1.orig/installperl
6+++ perl-5.12.3/installperl 6+++ perl-5.24.1/installperl
7@@ -3,8 +3,8 @@ 7@@ -2,8 +2,8 @@
8
8 BEGIN { 9 BEGIN {
9 require 5.004;
10 chdir '..' if !-d 'lib' and -d '../lib'; 10 chdir '..' if !-d 'lib' and -d '../lib';
11- @INC = 'lib'; 11- @INC = 'lib';
12- $ENV{PERL5LIB} = 'lib'; 12- $ENV{PERL5LIB} = 'lib';
@@ -14,4 +14,4 @@ Index: perl-5.12.3/installperl
14+# $ENV{PERL5LIB} = 'lib'; 14+# $ENV{PERL5LIB} = 'lib';
15 15
16 # This needs to be at BEGIN time, before any use of Config 16 # This needs to be at BEGIN time, before any use of Config
17 require './install_lib.pl'; 17 # install_lib itself loads and imports Config into main::
diff --git a/meta/recipes-devtools/perl/perl/make_ext.pl-fix-regenerate-makefile-failed-while-cc-.patch b/meta/recipes-devtools/perl/perl/make_ext.pl-fix-regenerate-makefile-failed-while-cc-.patch
index de6f65294c..b2c597974e 100644
--- a/meta/recipes-devtools/perl/perl/make_ext.pl-fix-regenerate-makefile-failed-while-cc-.patch
+++ b/meta/recipes-devtools/perl/perl/make_ext.pl-fix-regenerate-makefile-failed-while-cc-.patch
@@ -10,10 +10,10 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
10 make_ext.pl | 4 ++++ 10 make_ext.pl | 4 ++++
11 1 file changed, 4 insertions(+) 11 1 file changed, 4 insertions(+)
12 12
13diff --git a/make_ext.pl b/make_ext.pl 13Index: perl-5.24.1/make_ext.pl
14index b433762..9fc1a36 100644 14===================================================================
15--- a/make_ext.pl 15--- perl-5.24.1.orig/make_ext.pl
16+++ b/make_ext.pl 16+++ perl-5.24.1/make_ext.pl
17@@ -335,6 +335,10 @@ sub build_extension { 17@@ -335,6 +335,10 @@ sub build_extension {
18 print "Deleting non-Cross makefile\n"; 18 print "Deleting non-Cross makefile\n";
19 close $mfh or die "close $makefile: $!"; 19 close $mfh or die "close $makefile: $!";
@@ -24,7 +24,4 @@ index b433762..9fc1a36 100644
24+ } 24+ }
25 } 25 }
26 } 26 }
27 } 27 } else {
28--
291.8.1.2
30
diff --git a/meta/recipes-devtools/perl/perl/perl-archlib-exp.patch b/meta/recipes-devtools/perl/perl/perl-archlib-exp.patch
index d912d0031e..37bf523357 100644
--- a/meta/recipes-devtools/perl/perl/perl-archlib-exp.patch
+++ b/meta/recipes-devtools/perl/perl/perl-archlib-exp.patch
@@ -25,16 +25,16 @@ Upstream-Status:Inappropriate [embedded specific]
25 25
26Signed-off-by: Tom Zanussi <tom.zanussi@intel.com> 26Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
27 27
28Index: perl-5.14.2/config_h.SH 28Index: perl-5.24.1/config_h.SH
29=================================================================== 29===================================================================
30--- perl-5.14.2.orig/config_h.SH 30--- perl-5.24.1.orig/config_h.SH
31+++ perl-5.14.2/config_h.SH 31+++ perl-5.24.1/config_h.SH
32@@ -996,7 +996,7 @@ sed <<!GROK!THIS! >$CONFIG_H -e 's!^#und 32@@ -1434,7 +1434,7 @@ sed <<!GROK!THIS! >$CONFIG_H -e 's!^#und
33 * in programs that are not prepared to deal with ~ expansion at run-time. 33 * in programs that are not prepared to deal with ~ expansion at run-time.
34 */ 34 */
35 #$d_archlib ARCHLIB "$archlib" /**/ 35 #$d_archlib ARCHLIB "$archlib" /**/
36-#$d_archlib ARCHLIB_EXP "$archlibexp" /**/ 36-#$d_archlib ARCHLIB_EXP "$archlibexp" /**/
37+#$d_archlib ARCHLIB_EXP "$archlib_exp" /**/ 37+#$d_archlib ARCHLIB_EXP "$archlib_exp" /**/
38 38
39 /* ARCHNAME: 39 /* BIN:
40 * This symbol holds a string representing the architecture name. 40 * This symbol holds the path of the bin directory where the package will
diff --git a/meta/recipes-devtools/perl/perl/perl-dynloader.patch b/meta/recipes-devtools/perl/perl/perl-dynloader.patch
index 035beba66a..2572067a6e 100644
--- a/meta/recipes-devtools/perl/perl/perl-dynloader.patch
+++ b/meta/recipes-devtools/perl/perl/perl-dynloader.patch
@@ -7,13 +7,13 @@ system.
7 7
8Update by Nitin A Kamble <nitin.a.kamble@intel.com> 2011/04/21 8Update by Nitin A Kamble <nitin.a.kamble@intel.com> 2011/04/21
9 9
10Index: perl-5.14.2/dist/XSLoader/XSLoader_pm.PL 10Index: perl-5.24.1/dist/XSLoader/XSLoader_pm.PL
11=================================================================== 11===================================================================
12--- perl-5.14.2.orig/dist/XSLoader/XSLoader_pm.PL 12--- perl-5.24.1.orig/dist/XSLoader/XSLoader_pm.PL
13+++ perl-5.14.2/dist/XSLoader/XSLoader_pm.PL 13+++ perl-5.24.1/dist/XSLoader/XSLoader_pm.PL
14@@ -28,6 +28,20 @@ sub load { 14@@ -52,6 +52,20 @@ sub load {
15 15 my ($caller, $modlibname) = caller();
16 my ($module, $modlibname) = caller(); 16 my $module = $caller;
17 17
18+ # OE: Allow env to form dynamic loader to look in a different place 18+ # OE: Allow env to form dynamic loader to look in a different place
19+ # This is so it finds the host .so files, not the targets 19+ # This is so it finds the host .so files, not the targets
@@ -30,5 +30,5 @@ Index: perl-5.14.2/dist/XSLoader/XSLoader_pm.PL
30+ } 30+ }
31+ 31+
32 if (@_) { 32 if (@_) {
33 $module = $_[0]; 33 $module = $_[0];
34 } else { 34 } else {
diff --git a/meta/recipes-devtools/perl/perl/perl-enable-gdbm.patch b/meta/recipes-devtools/perl/perl/perl-enable-gdbm.patch
index aa83fca5ae..bad3373fd4 100644
--- a/meta/recipes-devtools/perl/perl/perl-enable-gdbm.patch
+++ b/meta/recipes-devtools/perl/perl/perl-enable-gdbm.patch
@@ -1,12 +1,12 @@
1Upstream-Status:Inappropriate [embedded specific] 1Upstream-Status:Inappropriate [embedded specific]
2 2
3Index: perl-5.8.8/config_h.SH 3Index: perl-5.24.1/config_h.SH
4=================================================================== 4===================================================================
5--- perl-5.8.8.orig/config_h.SH 2005-11-01 02:13:05.000000000 +0800 5--- perl-5.24.1.orig/config_h.SH
6+++ perl-5.8.8/config_h.SH 2010-11-01 17:06:07.215219738 +0800 6+++ perl-5.24.1/config_h.SH
7@@ -709,6 +709,12 @@ 7@@ -726,6 +726,12 @@ sed <<!GROK!THIS! >$CONFIG_H -e 's!^#und
8 */ 8 */
9 #$i_float I_FLOAT /**/ 9 #$i_gdbm I_GDBM /**/
10 10
11+/* I_GDBM: 11+/* I_GDBM:
12+ * This symbol, if defined, indicates that <gdbm.h> exists and should 12+ * This symbol, if defined, indicates that <gdbm.h> exists and should