diff options
| author | Robert Yang <liezhi.yang@windriver.com> | 2015-06-17 00:19:42 -0700 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-07-01 15:39:58 +0100 |
| commit | 3f7e55baa6b65b39c5698bb58320f85876cebe23 (patch) | |
| tree | 398e48b0e167f958d084ce1e8ccf25162ac9f0a8 /meta/recipes-devtools/perl/perl-5.20.0 | |
| parent | a01d406f6b0d9e08ce6d7408c2928a433fdf1843 (diff) | |
| download | poky-3f7e55baa6b65b39c5698bb58320f85876cebe23.tar.gz | |
perl: 5.20.0 -> 5.22.0
* Remove:
- perl-5.14.3-fix-CVE-2010-4777.patch: backport
- fix-FF_MORE-crash.patch: backport
- perl-rprovides.inc: it was introduced by 5.8.7, the lines in it are like:
RPROVIDES_perl-module-b-asmdata = "perl-module-${TARGET_SYS}-b-asmdata"
If some packages do RPDEND on something like
perl-module-${TARGET_SYS}-b-asmdatam, we need update the package rather
than keep use RPROVIDES in perl-rprovides.inc, so remove it.
- perl-rprovides_5.20.0.inc: it only has one line:
RPROVIDES_perl-module-module-build, but the perl-module-module-build
is gone in 5.22.0, so remove it.
* Update:
- debian patches from http://ftp.de.debian.org/debian/pool/main/p/perl/perl_5.20.0-1.debian.tar.xz
- Makefile.SH.patch
- Merge 0001-Makefile.SH-fix-do_install-failed.patch into Makefile.SH.patch
- native-nopacklist.patch
- config.sh
* The CGI.pm and Module::Build disappear from core, so no
perl-module-module-build.rpm any more, more info:
http://perltricks.com/article/165/2015/4/10/A-preview-of-Perl-5-22
(From OE-Core rev: 06d43a90acbe63baea62d220659149a3ff2f9198)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/perl/perl-5.20.0')
61 files changed, 0 insertions, 3804 deletions
diff --git a/meta/recipes-devtools/perl/perl-5.20.0/0001-Makefile.SH-fix-do_install-failed.patch b/meta/recipes-devtools/perl/perl-5.20.0/0001-Makefile.SH-fix-do_install-failed.patch deleted file mode 100644 index b1787ce4df..0000000000 --- a/meta/recipes-devtools/perl/perl-5.20.0/0001-Makefile.SH-fix-do_install-failed.patch +++ /dev/null | |||
| @@ -1,47 +0,0 @@ | |||
| 1 | From 2ed4b0c66fe7c7282922798eb3271b8f101359d1 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Hongxu Jia <hongxu.jia@windriver.com> | ||
| 3 | Date: Thu, 19 Jun 2014 19:34:56 +0800 | ||
| 4 | Subject: [PATCH] Makefile.SH: fix do_install failed | ||
| 5 | |||
| 6 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | ||
| 7 | --- | ||
| 8 | Makefile.SH | 16 +--------------- | ||
| 9 | 1 file changed, 1 insertion(+), 15 deletions(-) | ||
| 10 | |||
| 11 | diff --git a/Makefile.SH b/Makefile.SH | ||
| 12 | index f5d2d0f..e468c1b 100755 | ||
| 13 | --- a/Makefile.SH | ||
| 14 | +++ b/Makefile.SH | ||
| 15 | @@ -1074,8 +1074,7 @@ EOT | ||
| 16 | $spitshell >>$Makefile <<EOT | ||
| 17 | |||
| 18 | install_$name install-$name: \$(INSTALL_DEPENDENCE) installperl all installman | ||
| 19 | - \$(RUN_PERL) installperl --destdir=\$(DESTDIR) $flags \$(INSTALLFLAGS) \$(STRIPFLAGS) | ||
| 20 | - \$(RUN_PERL) installman --destdir=\$(DESTDIR) $flags | ||
| 21 | + ./hostperl -Ifake_config_library -Ilib -MConfig installperl --destdir=\$(DESTDIR) $flags \$(INSTALLFLAGS) \$(STRIPFLAGS) | ||
| 22 | EOT | ||
| 23 | fi | ||
| 24 | |||
| 25 | @@ -1104,19 +1103,6 @@ else | ||
| 26 | $spitshell >>$Makefile <<'!NO!SUBS!' | ||
| 27 | install.perl: $(INSTALL_DEPENDENCE) installperl | ||
| 28 | ./hostperl -Ifake_config_library -Ilib -MConfig installperl --destdir=$(DESTDIR) $(INSTALLFLAGS) $(STRIPFLAGS) | ||
| 29 | - | ||
| 30 | -# XXX Experimental. Hardwired values, but useful for testing. | ||
| 31 | -# Eventually Configure could ask for some of these values. | ||
| 32 | -install.html: all installhtml | ||
| 33 | - -@test -f README.vms && cd vms && $(LNS) ../README.vms README_vms.pod && cd .. | ||
| 34 | - $(RUN_PERL) installhtml \ | ||
| 35 | - --podroot=. --podpath=. --recurse \ | ||
| 36 | - --htmldir=$(privlib)/html \ | ||
| 37 | - --htmlroot=$(privlib)/html \ | ||
| 38 | - --splithead=pod/perlipc \ | ||
| 39 | - --splititem=pod/perlfunc \ | ||
| 40 | - --ignore=Porting/Maintainers.pm,Porting/pumpkin.pod,Porting/repository.pod \ | ||
| 41 | - --verbose | ||
| 42 | !NO!SUBS! | ||
| 43 | fi | ||
| 44 | |||
| 45 | -- | ||
| 46 | 1.8.1.2 | ||
| 47 | |||
diff --git a/meta/recipes-devtools/perl/perl-5.20.0/Configure-multilib.patch b/meta/recipes-devtools/perl/perl-5.20.0/Configure-multilib.patch deleted file mode 100644 index 9625b0b84e..0000000000 --- a/meta/recipes-devtools/perl/perl-5.20.0/Configure-multilib.patch +++ /dev/null | |||
| @@ -1,17 +0,0 @@ | |||
| 1 | Upstream-Status:Pending | ||
| 2 | |||
| 3 | Index: perl-5.12.3/Configure | ||
| 4 | =================================================================== | ||
| 5 | --- perl-5.12.3.orig/Configure | ||
| 6 | +++ perl-5.12.3/Configure | ||
| 7 | @@ -1316,8 +1316,9 @@ loclibpth="/usr/local/lib /opt/local/lib | ||
| 8 | loclibpth="$loclibpth /opt/gnu/lib /usr/GNU/lib /opt/GNU/lib" | ||
| 9 | |||
| 10 | : general looking path for locating libraries | ||
| 11 | -glibpth="/lib /usr/lib $xlibpth" | ||
| 12 | +glibpth="/lib /usr/lib /lib64 /usr/lib64 $xlibpth" | ||
| 13 | glibpth="$glibpth /usr/ccs/lib /usr/ucblib /usr/local/lib" | ||
| 14 | +test -f /usr/lib/*-linux-gnu/libc.so && glibpth="/usr/lib/*-linux-gnu $glibpth" | ||
| 15 | test -f /usr/shlib/libc.so && glibpth="/usr/shlib $glibpth" | ||
| 16 | test -f /shlib/libc.so && glibpth="/shlib $glibpth" | ||
| 17 | test -d /usr/lib64 && glibpth="$glibpth /lib64 /usr/lib64 /usr/local/lib64" | ||
diff --git a/meta/recipes-devtools/perl/perl-5.20.0/MM_Unix.pm.patch b/meta/recipes-devtools/perl/perl-5.20.0/MM_Unix.pm.patch deleted file mode 100644 index eb92ccb678..0000000000 --- a/meta/recipes-devtools/perl/perl-5.20.0/MM_Unix.pm.patch +++ /dev/null | |||
| @@ -1,22 +0,0 @@ | |||
| 1 | Upstream-Status:Pending | ||
| 2 | |||
| 3 | The perl-native should be relocatable while re-use sstate-cache from | ||
| 4 | another build, especially the original build was renamed/removed. | ||
| 5 | |||
| 6 | To get the MakeMaker.pm works in this case, we need perl wrapper here | ||
| 7 | instead of real perl binary. | ||
| 8 | |||
| 9 | Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com> | ||
| 10 | =================================================================== | ||
| 11 | --- perl-5.12.3/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm.orig 2011-08-12 16:07:30.000000000 +0800 | ||
| 12 | +++ perl-5.12.3/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm 2011-08-12 16:08:56.000000000 +0800 | ||
| 13 | @@ -1019,6 +1019,9 @@ | ||
| 14 | } | ||
| 15 | |||
| 16 | foreach my $name (@$names){ | ||
| 17 | + # Getting MakeMaker.pm use perl wrapper instead of 'perl.real' directly | ||
| 18 | + $name =~ s/perl\.real/perl/ if ($name =~ /perl\.real/); | ||
| 19 | + | ||
| 20 | foreach my $dir (@$dirs){ | ||
| 21 | next unless defined $dir; # $self->{PERL_SRC} may be undefined | ||
| 22 | my ($abs, $val); | ||
diff --git a/meta/recipes-devtools/perl/perl-5.20.0/Makefile.SH.patch b/meta/recipes-devtools/perl/perl-5.20.0/Makefile.SH.patch deleted file mode 100644 index 689d394931..0000000000 --- a/meta/recipes-devtools/perl/perl-5.20.0/Makefile.SH.patch +++ /dev/null | |||
| @@ -1,356 +0,0 @@ | |||
| 1 | Upstream-Status:Inappropriate [embedded specific] | ||
| 2 | |||
| 3 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | ||
| 4 | --- | ||
| 5 | Makefile.SH | 130 ++++++++++++++++++++++++++++++------------------------------ | ||
| 6 | 1 file changed, 66 insertions(+), 64 deletions(-) | ||
| 7 | |||
| 8 | diff --git a/Makefile.SH b/Makefile.SH | ||
| 9 | --- a/Makefile.SH | ||
| 10 | +++ b/Makefile.SH | ||
| 11 | @@ -39,10 +39,10 @@ case "$useshrplib" in | ||
| 12 | true) | ||
| 13 | # Prefix all runs of 'miniperl' and 'perl' with | ||
| 14 | # $ldlibpth so that ./perl finds *this* shared libperl. | ||
| 15 | - case "$LD_LIBRARY_PATH" in | ||
| 16 | - '') ldlibpth="LD_LIBRARY_PATH=` quote "$pwd" `" ;; | ||
| 17 | - *) ldlibpth="LD_LIBRARY_PATH=` quote "$pwd" `:` quote "$LD_LIBRARY_PATH" `" ;; | ||
| 18 | - esac | ||
| 19 | + #case "$LD_LIBRARY_PATH" in | ||
| 20 | + #'') ldlibpth="LD_LIBRARY_PATH=` quote "$pwd" `" ;; | ||
| 21 | + #*) ldlibpth="LD_LIBRARY_PATH=` quote "$pwd" `:` quote "$LD_LIBRARY_PATH" `" ;; | ||
| 22 | + #esac | ||
| 23 | |||
| 24 | pldlflags="$cccdlflags" | ||
| 25 | static_ldflags='' | ||
| 26 | @@ -122,10 +122,11 @@ true) | ||
| 27 | *) | ||
| 28 | eval "ldlibpthval=\"\$$ldlibpthname\"" | ||
| 29 | |||
| 30 | - case "$ldlibpthval" in | ||
| 31 | - '') ldlibpth="$ldlibpthname=` quote "$pwd" `" ;; | ||
| 32 | - *) ldlibpth="$ldlibpthname=` quote "$pwd" `:` quote "$ldlibpthval" `" ;; | ||
| 33 | - esac | ||
| 34 | +# We compile in the library path in OE from cross-compile, so lets not do this | ||
| 35 | +# case "$ldlibpthval" in | ||
| 36 | +# '') ldlibpth="$ldlibpthname=` quote "$pwd" `" ;; | ||
| 37 | +# *) ldlibpth="$ldlibpthname=` quote "$pwd" `:` quote "$ldlibpthval" `" ;; | ||
| 38 | +# esac | ||
| 39 | |||
| 40 | ;; | ||
| 41 | esac | ||
| 42 | @@ -141,18 +142,7 @@ true) | ||
| 43 | # INSTALL file, under "Building a shared perl library". | ||
| 44 | # If there is no pre-existing $libperl, we don't need | ||
| 45 | # to do anything further. | ||
| 46 | - if test -f $archlib/CORE/$libperl; then | ||
| 47 | - rm -f preload | ||
| 48 | - cat <<'EOT' > preload | ||
| 49 | -#! /bin/sh | ||
| 50 | -lib=$1 | ||
| 51 | -shift | ||
| 52 | -test -r $lib && export LD_PRELOAD="$lib $LD_PRELOAD" | ||
| 53 | -exec "$@" | ||
| 54 | -EOT | ||
| 55 | - chmod 755 preload | ||
| 56 | - ldlibpth="$ldlibpth `pwd`/preload `pwd`/$libperl" | ||
| 57 | - fi | ||
| 58 | + echo linux libraries overwritten by cross-compile patches | ||
| 59 | ;; | ||
| 60 | os390) test -f /bin/env && ldlibpth="/bin/env $ldlibpth" | ||
| 61 | ;; | ||
| 62 | @@ -565,9 +555,19 @@ splintfiles = $(c1) | ||
| 63 | @echo `$(CCCMDSRC)` -S $*.c | ||
| 64 | @`$(CCCMDSRC)` -S $*.c | ||
| 65 | |||
| 66 | -all: $(FIRSTMAKEFILE) $(MINIPERL_EXE) $(generated_pods) $(private) $(unidatafiles) $(public) $(dynamic_ext) $(nonxs_ext) extras.make | ||
| 67 | - @echo " "; | ||
| 68 | - @echo " Everything is up to date. Type '$(MAKE) test' to run test suite." | ||
| 69 | +#all: $(FIRSTMAKEFILE) $(MINIPERL_EXE) $(generated_pods) $(private) $(unidatafiles) $(public) $(dynamic_ext) $(nonxs_ext) extras.make | ||
| 70 | +# @echo " "; | ||
| 71 | +# @echo " Everything is up to date. Type '$(MAKE) test' to run test suite." | ||
| 72 | + | ||
| 73 | +all: $(FIRSTMAKEFILE) $(MINIPERL_EXE) miniperl $(unidatafiles) | ||
| 74 | + | ||
| 75 | +more: $(generated_pods) $(private) $(public) | ||
| 76 | + | ||
| 77 | +more2: $(dynamic_ext) | ||
| 78 | + | ||
| 79 | +more3: $(nonxs_ext) | ||
| 80 | + | ||
| 81 | +more4: extras.make | ||
| 82 | |||
| 83 | .PHONY: all translators utilities | ||
| 84 | |||
| 85 | @@ -575,7 +575,7 @@ all: $(FIRSTMAKEFILE) $(MINIPERL_EXE) $(generated_pods) $(private) $(unidatafile | ||
| 86 | # by make_patchnum.pl. | ||
| 87 | git_version.h: lib/Config_git.pl | ||
| 88 | |||
| 89 | -lib/Config_git.pl: $(MINIPERL_EXE) make_patchnum.pl | ||
| 90 | +lib/Config_git.pl: make_patchnum.pl | ||
| 91 | $(MINIPERL) make_patchnum.pl | ||
| 92 | |||
| 93 | # make sure that we recompile perl.c if the git version changes | ||
| 94 | @@ -588,8 +588,8 @@ perl$(OBJ_EXT): git_version.h | ||
| 95 | # loading, we need to build perl first. | ||
| 96 | case "$usedl$static_cwd" in | ||
| 97 | defineundef) | ||
| 98 | - util_deps='$(MINIPERL_EXE) $(CONFIGPM) lib/auto/Cwd/Cwd$(DLSUFFIX) FORCE' | ||
| 99 | - x2p_deps="\$(MINIPERL_EXE) \$(CONFIGPM) \$(dynamic_ext) x2p/$firstmakefile FORCE" | ||
| 100 | + util_deps='$(CONFIGPM) lib/auto/Cwd/Cwd$(DLSUFFIX) FORCE' | ||
| 101 | + x2p_deps="\$(CONFIGPM) \$(dynamic_ext) x2p/$firstmakefile FORCE" | ||
| 102 | ;; | ||
| 103 | definedefine) | ||
| 104 | util_deps='$(PERL_EXE) $(CONFIGPM) FORCE' | ||
| 105 | @@ -613,7 +613,7 @@ x2p/s2p: $x2p_deps | ||
| 106 | x2p/find2perl: $x2p_deps | ||
| 107 | cd x2p; \$(LDLIBPTH) \$(MAKE) find2perl | ||
| 108 | |||
| 109 | -utils/Makefile: \$(MINIPERL_EXE) \$(CONFIGPM) utils/Makefile.PL | ||
| 110 | +utils/Makefile: \$(CONFIGPM) utils/Makefile.PL | ||
| 111 | \$(MINIPERL) -Ilib utils/Makefile.PL | ||
| 112 | |||
| 113 | utilities: utils/Makefile $util_deps | ||
| 114 | @@ -708,7 +708,7 @@ esac | ||
| 115 | |||
| 116 | |||
| 117 | $spitshell >>$Makefile <<'!NO!SUBS!' | ||
| 118 | -perlmain.c: $(MINIPERL_EXE) ext/ExtUtils-Miniperl/pm_to_blib | ||
| 119 | +perlmain.c: ext/ExtUtils-Miniperl/lib/ExtUtils/Miniperl.pm | ||
| 120 | $(MINIPERL) -Ilib -MExtUtils::Miniperl -e 'writemain(\"perlmain.c", @ARGV)' DynaLoader $(static_ext) | ||
| 121 | |||
| 122 | # The file ext.libs is a list of libraries that must be linked in | ||
| 123 | @@ -769,7 +769,7 @@ PERLEXPORT = perl.exp | ||
| 124 | ;; | ||
| 125 | esac | ||
| 126 | $spitshell >>$Makefile <<'!NO!SUBS!' | ||
| 127 | -perl.exp: $(MINIPERLEXP) makedef.pl $(CONFIGPM) $(SYM) $(SYMH) | ||
| 128 | +perl.exp: makedef.pl $(CONFIGPM) $(SYM) $(SYMH) | ||
| 129 | ./$(MINIPERLEXP) makedef.pl --sort-fold PLATFORM=aix CC_FLAGS="$(OPTIMIZE)" > perl.exp | ||
| 130 | |||
| 131 | !NO!SUBS! | ||
| 132 | @@ -778,7 +778,7 @@ os2) | ||
| 133 | $spitshell >>$Makefile <<'!NO!SUBS!' | ||
| 134 | MINIPERLEXP = miniperl | ||
| 135 | |||
| 136 | -perl5.def: $(MINIPERLEXP) makedef.pl $(CONFIGPM) $(SYM) $(SYMH) miniperl.map | ||
| 137 | +perl5.def: makedef.pl $(CONFIGPM) $(SYM) $(SYMH) miniperl.map | ||
| 138 | ./$(MINIPERLEXP) makedef.pl PLATFORM=os2 -DPERL_DLL=$(PERL_DLL) CC_FLAGS="$(OPTIMIZE)" > perl5.def | ||
| 139 | |||
| 140 | !NO!SUBS! | ||
| 141 | @@ -838,7 +838,7 @@ $(LIBPERL): $& $(obj) $(DYNALOADER) $(LIBPERLEXPORT) | ||
| 142 | true) | ||
| 143 | $spitshell >>$Makefile <<'!NO!SUBS!' | ||
| 144 | rm -f $@ | ||
| 145 | - $(LD) -o $@ $(SHRPLDFLAGS) $(obj) $(DYNALOADER) $(libs) | ||
| 146 | + $(LD) -o $@ $(SHRPLDFLAGS) $(obj) $(DYNALOADER) $(libs) -Wl,-soname,libperl.so.5 | ||
| 147 | !NO!SUBS! | ||
| 148 | case "$osname" in | ||
| 149 | aix) | ||
| 150 | @@ -886,7 +886,9 @@ $(MINIPERL_EXE): lib/buildcustomize.pl | ||
| 151 | $spitshell >>$Makefile <<'!NO!SUBS!' | ||
| 152 | lib/buildcustomize.pl: $& $(mini_obj) | ||
| 153 | $(CC) -o $(MINIPERL_EXE) $(CLDFLAGS) $(mini_obj) $(libs) | ||
| 154 | - $(LDLIBPTH) ./miniperl$(HOST_EXE_EXT) -w -Ilib -Idist/Exporter/lib -MExporter -e '<?>' || sh -c 'echo >&2 Failed to build miniperl. Please run make minitest; exit 1' | ||
| 155 | + mv -f miniperl miniperl-target | ||
| 156 | + ln -s hostperl miniperl | ||
| 157 | + #$(LDLIBPTH) ./miniperl$(HOST_EXE_EXT) -w -Ilib -Idist/Exporter/lib -MExporter -e '<?>' || sh -c 'echo >&2 Failed to build miniperl. Please run make minitest; exit 1' | ||
| 158 | $(MINIPERL) -f write_buildcustomize.pl | ||
| 159 | !NO!SUBS! | ||
| 160 | ;; | ||
| 161 | @@ -894,7 +896,9 @@ lib/buildcustomize.pl: $& $(mini_obj) | ||
| 162 | $spitshell >>$Makefile <<'!NO!SUBS!' | ||
| 163 | lib/buildcustomize.pl: $& $(mini_obj) write ldcustomize.pl | ||
| 164 | $(CC) -o $(MINIPERL_EXE) $(mini_obj libs) | ||
| 165 | - $(LDLIBPTH) ./miniperl$(HOST _EXT) -w -Ilib -Idist/Exporter/lib -MExporter -e '<?>' || sh -c 'echo >&2 Failed to build miniperl. Please run make minitest; exit 1' | ||
| 166 | + mv -f miniperl miniperl-target | ||
| 167 | + ln -s hostperl miniperl | ||
| 168 | + #$(LDLIBPTH) ./miniperl$(HOST _EXT) -w -Ilib -Idist/Exporter/lib -MExporter -e '<?>' || sh -c 'echo >&2 Failed to build miniperl. Please run make minitest; exit 1' | ||
| 169 | $(MINIPERL) -f write_buildcustomize.pl | ||
| 170 | !NO!SUBS! | ||
| 171 | ;; | ||
| 172 | @@ -916,7 +920,9 @@ lib/buildcustomize.pl: $& $(mini_obj) write_buildcustomize.pl | ||
| 173 | -@rm -f miniperl.xok | ||
| 174 | $(CC) $(CLDFLAGS) $(NAMESPACEFLAGS) -o $(MINIPERL_EXE) \ | ||
| 175 | $(mini_obj) $(libs) | ||
| 176 | - $(LDLIBPTH) ./miniperl$(HOST_EXE_EXT) -w -Ilib -Idist/Exporter/lib -MExporter -e '<?>' || sh -c 'echo >&2 Failed to build miniperl. Please run make minitest; exit 1' | ||
| 177 | + mv -f miniperl miniperl-target | ||
| 178 | + ln -s hostperl miniperl | ||
| 179 | + #$(LDLIBPTH) ./miniperl$(HOST_EXE_EXT) -w -Ilib -Idist/Exporter/lib -MExporter -e '<?>' || sh -c 'echo >&2 Failed to build miniperl. Please run make minitest; exit 1' | ||
| 180 | $(MINIPERL) -f write_buildcustomize.pl | ||
| 181 | !NO!SUBS! | ||
| 182 | ;; | ||
| 183 | @@ -927,7 +933,9 @@ lib/buildcustomize.pl: \$& \$(mini_obj) write_buildcustomize.pl | ||
| 184 | -@rm -f miniperl.xok | ||
| 185 | -@rm \$(MINIPERL_EXE) | ||
| 186 | \$(LNS) \$(HOST_PERL) \$(MINIPERL_EXE) | ||
| 187 | - \$(LDLIBPTH) ./miniperl\$(HOST_EXE_EXT) -w -Ilib -Idist/Exporter/lib -MExporter -e '<?>' || sh -c 'echo >&2 Failed to build miniperl. Please run make minitest; exit 1' | ||
| 188 | + mv -f miniperl miniperl-target | ||
| 189 | + ln -s hostperl miniperl | ||
| 190 | + #\$(LDLIBPTH) ./miniperl\$(HOST_EXE_EXT) -w -Ilib -Idist/Exporter/lib -MExporter -e '<?>' || sh -c 'echo >&2 Failed to build miniperl. Please run make minitest; exit 1' | ||
| 191 | \$(MINIPERL) -f write_buildcustomize.pl 'osname' "$osname" | ||
| 192 | !GROK!THIS! | ||
| 193 | else | ||
| 194 | @@ -936,7 +944,9 @@ lib/buildcustomize.pl: $& $(mini_obj) write_buildcustomize.pl | ||
| 195 | -@rm -f miniperl.xok | ||
| 196 | $(CC) $(CLDFLAGS) -o $(MINIPERL_EXE) \ | ||
| 197 | $(mini_obj) $(libs) | ||
| 198 | - $(LDLIBPTH) ./miniperl$(HOST_EXE_EXT) -w -Ilib -Idist/Exporter/lib -MExporter -e '<?>' || sh -c 'echo >&2 Failed to build miniperl. Please run make minitest; exit 1' | ||
| 199 | + mv -f miniperl miniperl-target | ||
| 200 | + ln -s hostperl miniperl | ||
| 201 | + #$(LDLIBPTH) ./miniperl$(HOST_EXE_EXT) -w -Ilib -Idist/Exporter/lib -MExporter -e '<?>' || sh -c 'echo >&2 Failed to build miniperl. Please run make minitest; exit 1' | ||
| 202 | $(MINIPERL) -f write_buildcustomize.pl | ||
| 203 | !NO!SUBS! | ||
| 204 | fi | ||
| 205 | @@ -967,7 +977,7 @@ case "${osname}" in | ||
| 206 | catamount) | ||
| 207 | $spitshell >>$Makefile <<!GROK!THIS! | ||
| 208 | .PHONY: makeppport | ||
| 209 | -makeppport: \$(MINIPERL_EXE) \$(CONFIGPM) | ||
| 210 | +makeppport: \$(CONFIGPM) | ||
| 211 | -@for f in Makefile.PL PPPort_pm.PL PPPort_xs.PL ppport_h.PL; do \ | ||
| 212 | (cd ext/Devel-PPPort && `pwd`/run.sh ../../$(MINIPERL_EXE) -I../../lib \$\$f); \ | ||
| 213 | done | ||
| 214 | @@ -977,7 +987,7 @@ makeppport: \$(MINIPERL_EXE) \$(CONFIGPM) | ||
| 215 | *) | ||
| 216 | $spitshell >>$Makefile <<'!NO!SUBS!' | ||
| 217 | .PHONY: makeppport | ||
| 218 | -makeppport: $(MINIPERL_EXE) $(CONFIGPM) $(nonxs_ext) | ||
| 219 | +makeppport: $(CONFIGPM) $(nonxs_ext) | ||
| 220 | $(MINIPERL) mkppport | ||
| 221 | |||
| 222 | !NO!SUBS! | ||
| 223 | @@ -987,16 +997,16 @@ esac | ||
| 224 | $spitshell >>$Makefile <<'!NO!SUBS!' | ||
| 225 | |||
| 226 | .PHONY: preplibrary | ||
| 227 | -preplibrary: $(MINIPERL_EXE) $(CONFIGPM) $(PREPLIBRARY_LIBPERL) | ||
| 228 | +preplibrary: $(CONFIGPM) $(PREPLIBRARY_LIBPERL) | ||
| 229 | |||
| 230 | $(CONFIGPM_FROM_CONFIG_SH): $(CONFIGPOD) | ||
| 231 | |||
| 232 | -$(CONFIGPOD): config.sh $(MINIPERL_EXE) configpm Porting/Glossary lib/Config_git.pl | ||
| 233 | +$(CONFIGPOD): config.sh configpm Porting/Glossary lib/Config_git.pl | ||
| 234 | $(MINIPERL) configpm | ||
| 235 | |||
| 236 | unidatafiles $(unidatafiles) pod/perluniprops.pod: uni.data | ||
| 237 | |||
| 238 | -uni.data: $(MINIPERL_EXE) $(CONFIGPM) lib/unicore/mktables $(nonxs_ext) | ||
| 239 | +uni.data: $(CONFIGPM) lib/unicore/mktables $(nonxs_ext) | ||
| 240 | $(MINIPERL) lib/unicore/mktables -C lib/unicore -P pod -maketest -makelist -p | ||
| 241 | # Commented out so always runs, mktables looks at far more files than we | ||
| 242 | # can in this makefile to decide if needs to run or not | ||
| 243 | @@ -1005,22 +1015,22 @@ uni.data: $(MINIPERL_EXE) $(CONFIGPM) lib/unicore/mktables $(nonxs_ext) | ||
| 244 | # $(PERL_EXE) and ext because pod_lib.pl needs Digest::MD5 | ||
| 245 | # But also this ensures that all extensions are built before we try to scan | ||
| 246 | # them, which picks up Devel::PPPort's documentation. | ||
| 247 | -pod/perltoc.pod: $(perltoc_pod_prereqs) $(PERL_EXE) $(ext) pod/buildtoc | ||
| 248 | - $(RUN_PERL) -f pod/buildtoc -q | ||
| 249 | +pod/perltoc.pod: $(perltoc_pod_prereqs) $(ext) pod/buildtoc | ||
| 250 | + $(MINIPERL) -f pod/buildtoc -q | ||
| 251 | |||
| 252 | pod/perlapi.pod: pod/perlintern.pod | ||
| 253 | |||
| 254 | -pod/perlintern.pod: $(MINIPERL_EXE) autodoc.pl embed.fnc | ||
| 255 | +pod/perlintern.pod: autodoc.pl embed.fnc | ||
| 256 | $(MINIPERL) autodoc.pl | ||
| 257 | |||
| 258 | -pod/perlmodlib.pod: $(MINIPERL_EXE) pod/perlmodlib.PL MANIFEST | ||
| 259 | +pod/perlmodlib.pod: pod/perlmodlib.PL MANIFEST | ||
| 260 | $(MINIPERL) pod/perlmodlib.PL -q | ||
| 261 | |||
| 262 | pod/perl5200delta.pod: pod/perldelta.pod | ||
| 263 | $(RMS) pod/perl5200delta.pod | ||
| 264 | $(LNS) perldelta.pod pod/perl5200delta.pod | ||
| 265 | |||
| 266 | -extra.pods: $(MINIPERL_EXE) | ||
| 267 | +extra.pods: | ||
| 268 | -@test ! -f extra.pods || rm -f `cat extra.pods` | ||
| 269 | -@rm -f extra.pods | ||
| 270 | -@for x in `grep -l '^=[a-z]' README.* | grep -v README.vms` ; do \ | ||
| 271 | @@ -1075,11 +1085,7 @@ done | ||
| 272 | if test "X$hostperl" != X; then | ||
| 273 | $spitshell >>$Makefile <<'!NO!SUBS!' | ||
| 274 | install.perl: $(INSTALL_DEPENDENCE) installperl | ||
| 275 | - $(HOST_PERL) installperl --destdir=$(DESTDIR) $(INSTALLFLAGS) $(STRIPFLAGS) | ||
| 276 | - -@test ! -s extras.lst || $(MAKE) extras.install | ||
| 277 | - | ||
| 278 | -install.man: all installman | ||
| 279 | - $(HOST_PERL) installman --destdir=$(DESTDIR) $(INSTALLFLAGS) | ||
| 280 | + ./hostperl -Ifake_config_library -Ilib -MConfig installperl --destdir=$(DESTDIR) $(INSTALLFLAGS) $(STRIPFLAGS) | ||
| 281 | |||
| 282 | # XXX Experimental. Hardwired values, but useful for testing. | ||
| 283 | # Eventually Configure could ask for some of these values. | ||
| 284 | @@ -1097,11 +1103,7 @@ install.html: all installhtml | ||
| 285 | else | ||
| 286 | $spitshell >>$Makefile <<'!NO!SUBS!' | ||
| 287 | install.perl: $(INSTALL_DEPENDENCE) installperl | ||
| 288 | - $(RUN_PERL) installperl --destdir=$(DESTDIR) $(INSTALLFLAGS) $(STRIPFLAGS) | ||
| 289 | - -@test ! -s extras.lst || PATH="`pwd`:\${PATH}" PERL5LIB="`pwd`/lib" \$(RUN_PERL) -Ilib -MCPAN -e '@ARGV&&install(@ARGV)' `cat extras.lst` | ||
| 290 | - | ||
| 291 | -install.man: all installman | ||
| 292 | - $(RUN_PERL) installman --destdir=$(DESTDIR) $(INSTALLFLAGS) | ||
| 293 | + ./hostperl -Ifake_config_library -Ilib -MConfig installperl --destdir=$(DESTDIR) $(INSTALLFLAGS) $(STRIPFLAGS) | ||
| 294 | |||
| 295 | # XXX Experimental. Hardwired values, but useful for testing. | ||
| 296 | # Eventually Configure could ask for some of these values. | ||
| 297 | @@ -1206,16 +1208,16 @@ manicheck: FORCE | ||
| 298 | # | ||
| 299 | # DynaLoader may be needed for extensions that use Makefile.PL. | ||
| 300 | |||
| 301 | -$(DYNALOADER): $(MINIPERL_EXE) lib/buildcustomize.pl preplibrary FORCE $(nonxs_ext) | ||
| 302 | +$(DYNALOADER): lib/buildcustomize.pl preplibrary FORCE $(nonxs_ext) | ||
| 303 | $(MINIPERL) make_ext.pl $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL) LINKTYPE=static $(STATIC_LDFLAGS) | ||
| 304 | |||
| 305 | -d_dummy $(dynamic_ext): $(MINIPERL_EXE) lib/buildcustomize.pl preplibrary makeppport $(DYNALOADER) FORCE $(PERLEXPORT) $(LIBPERL) | ||
| 306 | +d_dummy $(dynamic_ext): lib/buildcustomize.pl preplibrary makeppport $(DYNALOADER) FORCE $(PERLEXPORT) $(LIBPERL) | ||
| 307 | $(MINIPERL) make_ext.pl $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL) LINKTYPE=dynamic | ||
| 308 | |||
| 309 | -s_dummy $(static_ext): $(MINIPERL_EXE) lib/buildcustomize.pl preplibrary makeppport $(DYNALOADER) FORCE | ||
| 310 | +s_dummy $(static_ext): lib/buildcustomize.pl preplibrary makeppport $(DYNALOADER) FORCE | ||
| 311 | $(MINIPERL) make_ext.pl $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL) LINKTYPE=static $(STATIC_LDFLAGS) | ||
| 312 | |||
| 313 | -n_dummy $(nonxs_ext): $(MINIPERL_EXE) lib/buildcustomize.pl preplibrary FORCE | ||
| 314 | +n_dummy $(nonxs_ext): lib/buildcustomize.pl preplibrary FORCE | ||
| 315 | $(MINIPERL) make_ext.pl $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL) | ||
| 316 | !NO!SUBS! | ||
| 317 | |||
| 318 | @@ -1409,7 +1411,7 @@ test_prep_pre: preplibrary utilities $(nonxs_ext) | ||
| 319 | |||
| 320 | case "$targethost" in | ||
| 321 | '') $spitshell >>$Makefile <<'!NO!SUBS!' | ||
| 322 | -test_prep test-prep: test_prep_pre $(MINIPERL_EXE) $(unidatafiles) $(PERL_EXE) \ | ||
| 323 | +test_prep test-prep: test_prep_pre $(unidatafiles) $(PERL_EXE) \ | ||
| 324 | $(dynamic_ext) $(TEST_PERL_DLL) runtests x2p/s2p x2p/find2perl \ | ||
| 325 | $(generated_pods) | ||
| 326 | cd t && (rm -f $(PERL_EXE); $(LNS) ../$(PERL_EXE) $(PERL_EXE)) | ||
| 327 | @@ -1417,7 +1419,7 @@ test_prep test-prep: test_prep_pre $(MINIPERL_EXE) $(unidatafiles) $(PERL_EXE) \ | ||
| 328 | !NO!SUBS! | ||
| 329 | ;; | ||
| 330 | *) $spitshell >>$Makefile <<!GROK!THIS! | ||
| 331 | -test_prep test-prep: test_prep_pre \$(MINIPERL_EXE) \$(unidatafiles) \$(PERL_EXE) \ | ||
| 332 | +test_prep test-prep: test_prep_pre \$(unidatafiles) \$(PERL_EXE) \ | ||
| 333 | \$(dynamic_ext) \$(TEST_PERL_DLL) runtests x2p/s2p x2p/find2perl \ | ||
| 334 | \$(generated_pods) | ||
| 335 | $to libperl.* | ||
| 336 | @@ -1469,7 +1471,7 @@ test_prep test-prep: test_prep_pre \$(MINIPERL_EXE) \$(unidatafiles) \$(PERL_EXE | ||
| 337 | esac | ||
| 338 | |||
| 339 | $spitshell >>$Makefile <<'!NO!SUBS!' | ||
| 340 | -test_prep_reonly: $(MINIPERL_EXE) $(PERL_EXE) $(dynamic_ext_re) $(TEST_PERL_DLL) | ||
| 341 | +test_prep_reonly: $(PERL_EXE) $(dynamic_ext_re) $(TEST_PERL_DLL) | ||
| 342 | $(MINIPERL) make_ext.pl $(dynamic_ext_re) MAKE=$(MAKE) LIBPERL_A=$(LIBPERL) LINKTYPE=dynamic | ||
| 343 | cd t && (rm -f $(PERL_EXE); $(LNS) ../$(PERL_EXE) $(PERL_EXE)) | ||
| 344 | !NO!SUBS! | ||
| 345 | @@ -1520,7 +1522,7 @@ $spitshell >>$Makefile <<'!NO!SUBS!' | ||
| 346 | |||
| 347 | # Can't depend on lib/Config.pm because that might be where miniperl | ||
| 348 | # is crashing. | ||
| 349 | -minitest: $(MINIPERL_EXE) | ||
| 350 | +minitest: | ||
| 351 | -@test -f lib/Config.pm || $(MAKE) lib/Config.pm $(unidatafiles) | ||
| 352 | @echo " " | ||
| 353 | @echo "You may see some irrelevant test failures if you have been unable" | ||
| 354 | -- | ||
| 355 | 1.8.1.2 | ||
| 356 | |||
diff --git a/meta/recipes-devtools/perl/perl-5.20.0/Makefile.patch b/meta/recipes-devtools/perl/perl-5.20.0/Makefile.patch deleted file mode 100644 index 858e2e10fb..0000000000 --- a/meta/recipes-devtools/perl/perl-5.20.0/Makefile.patch +++ /dev/null | |||
| @@ -1,58 +0,0 @@ | |||
| 1 | Upstream-Status:Inappropriate [embedded specific] | ||
| 2 | |||
| 3 | Index: perl-5.14.2/Cross/Makefile | ||
| 4 | =================================================================== | ||
| 5 | --- perl-5.14.2.orig/Cross/Makefile | ||
| 6 | +++ perl-5.14.2/Cross/Makefile | ||
| 7 | @@ -1,6 +1,7 @@ | ||
| 8 | ## Toplevel Makefile for cross-compilation of perl | ||
| 9 | |||
| 10 | -export TOPDIR=${shell pwd} | ||
| 11 | +override TOPDIR=${shell pwd} | ||
| 12 | +export TOPDIR | ||
| 13 | include $(TOPDIR)/config | ||
| 14 | export CFLAGS | ||
| 15 | export SYS=$(ARCH)-$(OS) | ||
| 16 | @@ -10,7 +11,7 @@ export OPTIMIZATION = -O2 | ||
| 17 | |||
| 18 | export CC = $(CROSS)gcc | ||
| 19 | export CXX = $(CROSS)g++ | ||
| 20 | -export LD = $(CROSS)ld | ||
| 21 | +export LD = $(CC) | ||
| 22 | export STRIP = $(CROSS)strip | ||
| 23 | export AR = $(CROSS)ar | ||
| 24 | export RANLIB = $(CROSS)ranlib | ||
| 25 | @@ -32,17 +33,6 @@ CFLAGS+=$(FULL_OPTIMIZATION) | ||
| 26 | all: | ||
| 27 | @echo Please read the README file before doing anything else. | ||
| 28 | |||
| 29 | -gen_patch: | ||
| 30 | - diff -Bbur ../Makefile.SH Makefile.SH > Makefile.SH.patch | ||
| 31 | - diff -Bbur ../installperl installperl > installperl.patch | ||
| 32 | - | ||
| 33 | -patch: | ||
| 34 | - cd .. ; if [ ! -e ./CROSS_PATCHED ] ; then \ | ||
| 35 | - patch -p1 < Cross/Makefile.SH.patch; \ | ||
| 36 | - patch -p1 < Cross/installperl.patch ; mv installperl installperl-patched; \ | ||
| 37 | - sed -e 's/XXSTRIPXX/$(SYS)/' installperl-patched > installperl; \ | ||
| 38 | - touch CROSS_PATCHED ; fi | ||
| 39 | - | ||
| 40 | perl: | ||
| 41 | @echo Perl cross-build directory is $(TOPDIR) | ||
| 42 | @echo Target arch is $(SYS) | ||
| 43 | @@ -52,11 +42,11 @@ perl: | ||
| 44 | $(TOPDIR)/generate_config_sh config.sh-$(SYS) > $(TOPDIR)/../config.sh | ||
| 45 | cd $(TOPDIR)/.. ; ./Configure -S ; make depend ; make ; make more | ||
| 46 | cd $(TOPDIR)/.. ; mkdir -p fake_config_library ; cp lib/Config.pm lib/Config_heavy.pl fake_config_library | ||
| 47 | - cd $(TOPDIR)/.. ; $(MAKE) more2 "PERLRUN=/usr/bin/perl -I$(TOPDIR)/../fake_config_library -MConfig" | ||
| 48 | - cd $(TOPDIR)/.. ; $(MAKE) more3 "PERLRUN=/usr/bin/perl -I$(TOPDIR)/../fake_config_library -MConfig" | ||
| 49 | - cd $(TOPDIR)/.. ; $(MAKE) more4 "PERLRUN=/usr/bin/perl -I$(TOPDIR)/../fake_config_library -MConfig" | ||
| 50 | + cd $(TOPDIR)/.. ; $(MAKE) more2 "PERLRUN=hostperl -I$(TOPDIR)/../fake_config_library -MConfig" | ||
| 51 | + cd $(TOPDIR)/.. ; $(MAKE) more3 "PERLRUN=hostperl -I$(TOPDIR)/../fake_config_library -MConfig" | ||
| 52 | + cd $(TOPDIR)/.. ; $(MAKE) more4 "PERLRUN=hostperl -I$(TOPDIR)/../fake_config_library -MConfig" | ||
| 53 | cd $(TOPDIR)/.. ; rm -rf install_me_here | ||
| 54 | - cd $(TOPDIR)/.. ; make install-strip | ||
| 55 | +# cd $(TOPDIR)/.. ; make install-strip | ||
| 56 | cd $(TOPDIR)/.. ; sh -x Cross/warp | ||
| 57 | |||
| 58 | |||
diff --git a/meta/recipes-devtools/perl/perl-5.20.0/config.sh b/meta/recipes-devtools/perl/perl-5.20.0/config.sh deleted file mode 100644 index 1ac1355829..0000000000 --- a/meta/recipes-devtools/perl/perl-5.20.0/config.sh +++ /dev/null | |||
| @@ -1,1113 +0,0 @@ | |||
| 1 | #!/bin/sh | ||
| 2 | # | ||
| 3 | # This file was produced by running the Configure script. It holds all the | ||
| 4 | # definitions figured out by Configure. Should you modify one of these values, | ||
| 5 | # do not forget to propagate your changes by running "Configure -der". You may | ||
| 6 | # instead choose to run each of the .SH files by yourself, or "Configure -S". | ||
| 7 | # | ||
| 8 | |||
| 9 | # Package name : perl5 | ||
| 10 | # Source directory : . | ||
| 11 | # Configuration time: Tue Jun 24 03:00:02 UTC 2014 | ||
| 12 | # Configured by : Open Embedded | ||
| 13 | # Target system : linux qemuarm 3.14.5-yocto-standard #1 preempt mon jun 23 19:42:18 cst 2014 armv5tejl gnulinux | ||
| 14 | |||
| 15 | : Configure command line arguments. | ||
| 16 | config_arg0='Configure' | ||
| 17 | config_args='-des -Doptimize=-O2 -Dmyhostname=localhost -Dperladmin=root@localhost -Dcc=gcc -Dcf_by=Open Embedded -Dinstallprefix=@EXECPREFIX@ -Dprefix=@EXECPREFIX@ -Dvendorprefix=@EXECPREFIX@ -Dsiteprefix=@EXECPREFIX@ -Dotherlibdirs=@LIBDIR@/perl/5.20.0 -Duseshrplib -Dusethreads -Duseithreads -Duselargefiles -Ud_dosuid -Dd_semctl_semun -Ui_db -Ui_ndbm -Ui_gdbm -Di_shadow -Di_syslog -Dman3ext=3pm -Duseperlio -Dinstallusrbinperl -Ubincompat5005 -Uversiononly -Dpager=/usr/bin/less -isr' | ||
| 18 | config_argc=28 | ||
| 19 | config_arg1='-des' | ||
| 20 | config_arg2='-Doptimize=-O2' | ||
| 21 | config_arg3='-Dmyhostname=localhost' | ||
| 22 | config_arg4='-Dperladmin=root@localhost' | ||
| 23 | config_arg5='-Dcc=gcc' | ||
| 24 | config_arg6='-Dcf_by=Open Embedded' | ||
| 25 | config_arg7='-Dinstallprefix=@EXECPREFIX@' | ||
| 26 | config_arg8='-Dprefix=@EXECPREFIX@' | ||
| 27 | config_arg9='-Dvendorprefix=@EXECPREFIX@' | ||
| 28 | config_arg10='-Dsiteprefix=@EXECPREFIX@' | ||
| 29 | config_arg11='-Dotherlibdirs=@LIBDIR@/perl/5.20.0' | ||
| 30 | config_arg12='-Duseshrplib' | ||
| 31 | config_arg13='-Dusethreads' | ||
| 32 | config_arg14='-Duseithreads' | ||
| 33 | config_arg15='-Duselargefiles' | ||
| 34 | config_arg16='-Ud_dosuid' | ||
| 35 | config_arg17='-Dd_semctl_semun' | ||
| 36 | config_arg18='-Ui_db' | ||
| 37 | config_arg19='-Ui_ndbm' | ||
| 38 | config_arg20='-Ui_gdbm' | ||
| 39 | config_arg21='-Di_shadow' | ||
| 40 | config_arg22='-Di_syslog' | ||
| 41 | config_arg23='-Dman3ext=3pm' | ||
| 42 | config_arg24='-Duseperlio' | ||
| 43 | config_arg25='-Dinstallusrbinperl' | ||
| 44 | config_arg26='-Ubincompat5005' | ||
| 45 | config_arg27='-Uversiononly' | ||
| 46 | config_arg28='-Dpager=/usr/bin/less -isr' | ||
| 47 | |||
| 48 | Author='' | ||
| 49 | Date='$Date' | ||
| 50 | Header='' | ||
| 51 | Id='$Id' | ||
| 52 | Locker='' | ||
| 53 | Log='$Log' | ||
| 54 | RCSfile='$RCSfile' | ||
| 55 | Revision='$Revision' | ||
| 56 | Source='' | ||
| 57 | State='' | ||
| 58 | _a='.a' | ||
| 59 | _exe='' | ||
| 60 | _o='.o' | ||
| 61 | afs='false' | ||
| 62 | afsroot='/afs' | ||
| 63 | ansi2knr='' | ||
| 64 | aphostname='' | ||
| 65 | api_revision='5' | ||
| 66 | api_subversion='0' | ||
| 67 | api_version='14' | ||
| 68 | api_versionstring='5.14.0' | ||
| 69 | ar='ar' | ||
| 70 | archlib='@LIBDIR@/perl/5.20.0/@ARCH@-thread-multi' | ||
| 71 | archlibexp='@STAGINGDIR@@LIBDIR@/perl/5.20.0/@ARCH@-thread-multi' | ||
| 72 | archlib_exp='@LIBDIR@/perl/5.20.0/@ARCH@-thread-multi' | ||
| 73 | archname64='' | ||
| 74 | archname='@ARCH@-thread-multi' | ||
| 75 | archobjs='' | ||
| 76 | asctime_r_proto='REENTRANT_PROTO_B_SB' | ||
| 77 | awk='awk' | ||
| 78 | baserev='5.0' | ||
| 79 | bash='' | ||
| 80 | bin='@USRBIN@' | ||
| 81 | bin_ELF='define' | ||
| 82 | binexp='@USRBIN@' | ||
| 83 | bison='bison' | ||
| 84 | byacc='byacc' | ||
| 85 | c='' | ||
| 86 | castflags='0' | ||
| 87 | cat='cat' | ||
| 88 | cc='gcc' | ||
| 89 | cccdlflags='-fPIC' | ||
| 90 | ccdlflags='-Wl,-E -Wl,-rpath,@LIBDIR@/perl/5.20.0/@ARCH@-thread-multi/CORE' | ||
| 91 | ccflags='-D_REENTRANT -D_GNU_SOURCE -fno-strict-aliasing -pipe -fstack-protector -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64' | ||
| 92 | ccflags_uselargefiles='-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64' | ||
| 93 | ccname='gcc' | ||
| 94 | ccsymbols='' | ||
| 95 | ccversion='' | ||
| 96 | cf_by='Open Embedded' | ||
| 97 | cf_email='Open Embedded@localhost.localdomain' | ||
| 98 | charbits='8' | ||
| 99 | charsize='1' | ||
| 100 | chgrp='' | ||
| 101 | chmod='chmod' | ||
| 102 | chown='' | ||
| 103 | clocktype='clock_t' | ||
| 104 | comm='comm' | ||
| 105 | compress='' | ||
| 106 | contains='grep' | ||
| 107 | cp='cp' | ||
| 108 | cpio='' | ||
| 109 | cpp='cpp' | ||
| 110 | cpp_stuff='42' | ||
| 111 | cppccsymbols='' | ||
| 112 | cppflags='-D_REENTRANT -D_GNU_SOURCE -fno-strict-aliasing -pipe -fstack-protector' | ||
| 113 | cpplast='-' | ||
| 114 | cppminus='-' | ||
| 115 | cpprun='gcc -E' | ||
| 116 | cppstdin='gcc -E' | ||
| 117 | crypt_r_proto='REENTRANT_PROTO_B_CCS' | ||
| 118 | cryptlib='' | ||
| 119 | csh='csh' | ||
| 120 | ctermid_r_proto='0' | ||
| 121 | ctime_r_proto='REENTRANT_PROTO_B_SB' | ||
| 122 | d_Gconvert='gcvt((x),(n),(b))' | ||
| 123 | d_PRIEUldbl='define' | ||
| 124 | d_PRIFUldbl='define' | ||
| 125 | d_PRIGUldbl='define' | ||
| 126 | d_PRIXU64='define' | ||
| 127 | d_PRId64='define' | ||
| 128 | d_PRIeldbl='define' | ||
| 129 | d_PRIfldbl='define' | ||
| 130 | d_PRIgldbl='define' | ||
| 131 | d_PRIi64='define' | ||
| 132 | d_PRIo64='define' | ||
| 133 | d_PRIu64='define' | ||
| 134 | d_PRIx64='define' | ||
| 135 | d_SCNfldbl='define' | ||
| 136 | d__fwalk='undef' | ||
| 137 | d_access='define' | ||
| 138 | d_accessx='undef' | ||
| 139 | d_aintl='undef' | ||
| 140 | d_alarm='define' | ||
| 141 | d_archlib='define' | ||
| 142 | d_asctime64='undef' | ||
| 143 | d_asctime_r='define' | ||
| 144 | d_atolf='undef' | ||
| 145 | d_atoll='define' | ||
| 146 | d_attribute_deprecated='define' | ||
| 147 | d_attribute_format='define' | ||
| 148 | d_attribute_malloc='define' | ||
| 149 | d_attribute_nonnull='define' | ||
| 150 | d_attribute_noreturn='define' | ||
| 151 | d_attribute_pure='define' | ||
| 152 | d_attribute_unused='define' | ||
| 153 | d_attribute_warn_unused_result='define' | ||
| 154 | d_bcmp='define' | ||
| 155 | d_bcopy='define' | ||
| 156 | d_bsd='undef' | ||
| 157 | d_bsdgetpgrp='undef' | ||
| 158 | d_bsdsetpgrp='undef' | ||
| 159 | d_builtin_choose_expr='define' | ||
| 160 | d_builtin_expect='define' | ||
| 161 | d_bzero='define' | ||
| 162 | d_c99_variadic_macros='define' | ||
| 163 | d_casti32='undef' | ||
| 164 | d_castneg='define' | ||
| 165 | d_charvspr='undef' | ||
| 166 | d_chown='define' | ||
| 167 | d_chroot='define' | ||
| 168 | d_chsize='undef' | ||
| 169 | d_class='undef' | ||
| 170 | d_clearenv='define' | ||
| 171 | d_closedir='define' | ||
| 172 | d_cmsghdr_s='define' | ||
| 173 | d_const='define' | ||
| 174 | d_copysignl='define' | ||
| 175 | d_cplusplus='undef' | ||
| 176 | d_crypt='define' | ||
| 177 | d_crypt_r='define' | ||
| 178 | d_csh='undef' | ||
| 179 | d_ctermid='define' | ||
| 180 | d_ctermid_r='undef' | ||
| 181 | d_ctime64='undef' | ||
| 182 | d_ctime_r='define' | ||
| 183 | d_cuserid='define' | ||
| 184 | d_dbl_dig='define' | ||
| 185 | d_dbminitproto='undef' | ||
| 186 | d_difftime64='undef' | ||
| 187 | d_difftime='define' | ||
| 188 | d_dir_dd_fd='undef' | ||
| 189 | d_dirfd='define' | ||
| 190 | d_dirnamlen='undef' | ||
| 191 | d_dlerror='define' | ||
| 192 | d_dlopen='define' | ||
| 193 | d_dlsymun='undef' | ||
| 194 | d_dosuid='undef' | ||
| 195 | d_drand48_r='define' | ||
| 196 | d_drand48proto='define' | ||
| 197 | d_dup2='define' | ||
| 198 | d_eaccess='define' | ||
| 199 | d_endgrent='define' | ||
| 200 | d_endgrent_r='undef' | ||
| 201 | d_endhent='define' | ||
| 202 | d_endhostent_r='undef' | ||
| 203 | d_endnent='define' | ||
| 204 | d_endnetent_r='undef' | ||
| 205 | d_endpent='define' | ||
| 206 | d_endprotoent_r='undef' | ||
| 207 | d_endpwent='define' | ||
| 208 | d_endpwent_r='undef' | ||
| 209 | d_endsent='define' | ||
| 210 | d_endservent_r='undef' | ||
| 211 | d_eofnblk='define' | ||
| 212 | d_eunice='undef' | ||
| 213 | d_faststdio='define' | ||
| 214 | d_fchdir='define' | ||
| 215 | d_fchmod='define' | ||
| 216 | d_fchown='define' | ||
| 217 | d_fcntl='define' | ||
| 218 | d_fcntl_can_lock='define' | ||
| 219 | d_fd_macros='define' | ||
| 220 | d_fd_set='define' | ||
| 221 | d_fds_bits='define' | ||
| 222 | d_fgetpos='define' | ||
| 223 | d_finite='define' | ||
| 224 | d_finitel='define' | ||
| 225 | d_flexfnam='define' | ||
| 226 | d_flock='define' | ||
| 227 | d_flockproto='define' | ||
| 228 | d_fork='define' | ||
| 229 | d_fp_class='undef' | ||
| 230 | d_fpathconf='define' | ||
| 231 | d_fpclass='undef' | ||
| 232 | d_fpclassify='undef' | ||
| 233 | d_fpclassl='undef' | ||
| 234 | d_fpos64_t='undef' | ||
| 235 | d_frexpl='define' | ||
| 236 | d_fs_data_s='undef' | ||
| 237 | d_fseeko='define' | ||
| 238 | d_fsetpos='define' | ||
| 239 | d_fstatfs='define' | ||
| 240 | d_fstatvfs='define' | ||
| 241 | d_fsync='define' | ||
| 242 | d_ftello='define' | ||
| 243 | d_ftime='undef' | ||
| 244 | d_futimes='define' | ||
| 245 | d_gdbm_ndbm_h_uses_prototypes='undef' | ||
| 246 | d_gdbmndbm_h_uses_prototypes='undef' | ||
| 247 | d_getaddrinfo='define' | ||
| 248 | d_getcwd='define' | ||
| 249 | d_getespwnam='undef' | ||
| 250 | d_getfsstat='undef' | ||
| 251 | d_getgrent='define' | ||
| 252 | d_getgrent_r='define' | ||
| 253 | d_getgrgid_r='define' | ||
| 254 | d_getgrnam_r='define' | ||
| 255 | d_getgrps='define' | ||
| 256 | d_gethbyaddr='define' | ||
| 257 | d_gethbyname='define' | ||
| 258 | d_gethent='define' | ||
| 259 | d_gethname='define' | ||
| 260 | d_gethostbyaddr_r='define' | ||
| 261 | d_gethostbyname_r='define' | ||
| 262 | d_gethostent_r='define' | ||
| 263 | d_gethostprotos='define' | ||
| 264 | d_getitimer='define' | ||
| 265 | d_getlogin='define' | ||
| 266 | d_getlogin_r='define' | ||
| 267 | d_getmnt='undef' | ||
| 268 | d_getmntent='define' | ||
| 269 | d_getnameinfo='define' | ||
| 270 | d_getnbyaddr='define' | ||
| 271 | d_getnbyname='define' | ||
| 272 | d_getnent='define' | ||
| 273 | d_getnetbyaddr_r='define' | ||
| 274 | d_getnetbyname_r='define' | ||
| 275 | d_getnetent_r='define' | ||
| 276 | d_getnetprotos='define' | ||
| 277 | d_getpagsz='define' | ||
| 278 | d_getpbyname='define' | ||
| 279 | d_getpbynumber='define' | ||
| 280 | d_getpent='define' | ||
| 281 | d_getpgid='define' | ||
| 282 | d_getpgrp2='undef' | ||
| 283 | d_getpgrp='define' | ||
| 284 | d_getppid='define' | ||
| 285 | d_getprior='define' | ||
| 286 | d_getprotobyname_r='define' | ||
| 287 | d_getprotobynumber_r='define' | ||
| 288 | d_getprotoent_r='define' | ||
| 289 | d_getprotoprotos='define' | ||
| 290 | d_getprpwnam='undef' | ||
| 291 | d_getpwent='define' | ||
| 292 | d_getpwent_r='define' | ||
| 293 | d_getpwnam_r='define' | ||
| 294 | d_getpwuid_r='define' | ||
| 295 | d_getsbyname='define' | ||
| 296 | d_getsbyport='define' | ||
| 297 | d_getsent='define' | ||
| 298 | d_getservbyname_r='define' | ||
| 299 | d_getservbyport_r='define' | ||
| 300 | d_getservent_r='define' | ||
| 301 | d_getservprotos='define' | ||
| 302 | d_getspnam='define' | ||
| 303 | d_getspnam_r='define' | ||
| 304 | d_gettimeod='define' | ||
| 305 | d_gmtime64='undef' | ||
| 306 | d_gmtime_r='define' | ||
| 307 | d_gnulibc='define' | ||
| 308 | d_grpasswd='define' | ||
| 309 | d_hasmntopt='define' | ||
| 310 | d_htonl='define' | ||
| 311 | d_ilogbl='define' | ||
| 312 | d_inc_version_list='undef' | ||
| 313 | d_index='undef' | ||
| 314 | d_inetaton='define' | ||
| 315 | d_inetntop='define' | ||
| 316 | d_inetpton='define' | ||
| 317 | d_int64_t='define' | ||
| 318 | d_isascii='define' | ||
| 319 | d_isfinite='undef' | ||
| 320 | d_isinf='define' | ||
| 321 | d_isnan='define' | ||
| 322 | d_isnanl='define' | ||
| 323 | d_killpg='define' | ||
| 324 | d_lchown='define' | ||
| 325 | d_ldbl_dig='define' | ||
| 326 | d_libm_lib_version='define' | ||
| 327 | d_link='define' | ||
| 328 | d_localtime64='undef' | ||
| 329 | d_localtime_r='define' | ||
| 330 | d_localtime_r_needs_tzset='define' | ||
| 331 | d_locconv='define' | ||
| 332 | d_lockf='define' | ||
| 333 | d_longdbl='define' | ||
| 334 | d_longlong='define' | ||
| 335 | d_lseekproto='define' | ||
| 336 | d_lstat='define' | ||
| 337 | d_madvise='define' | ||
| 338 | d_malloc_good_size='undef' | ||
| 339 | d_malloc_size='undef' | ||
| 340 | d_mblen='define' | ||
| 341 | d_mbstowcs='define' | ||
| 342 | d_mbtowc='define' | ||
| 343 | d_memchr='define' | ||
| 344 | d_memcmp='define' | ||
| 345 | d_memcpy='define' | ||
| 346 | d_memmove='define' | ||
| 347 | d_memset='define' | ||
| 348 | d_mkdir='define' | ||
| 349 | d_mkdtemp='define' | ||
| 350 | d_mkfifo='define' | ||
| 351 | d_mkstemp='define' | ||
| 352 | d_mkstemps='define' | ||
| 353 | d_mktime64='undef' | ||
| 354 | d_mktime='define' | ||
| 355 | d_mmap='define' | ||
| 356 | d_modfl='define' | ||
| 357 | d_modfl_pow32_bug='undef' | ||
| 358 | d_modflproto='define' | ||
| 359 | d_mprotect='define' | ||
| 360 | d_msg='define' | ||
| 361 | d_msg_ctrunc='define' | ||
| 362 | d_msg_dontroute='define' | ||
| 363 | d_msg_oob='define' | ||
| 364 | d_msg_peek='define' | ||
| 365 | d_msg_proxy='define' | ||
| 366 | d_msgctl='define' | ||
| 367 | d_msgget='define' | ||
| 368 | d_msghdr_s='define' | ||
| 369 | d_msgrcv='define' | ||
| 370 | d_msgsnd='define' | ||
| 371 | d_msync='define' | ||
| 372 | d_munmap='define' | ||
| 373 | d_mymalloc='undef' | ||
| 374 | d_ndbm='undef' | ||
| 375 | d_ndbm_h_uses_prototypes='undef' | ||
| 376 | d_nice='define' | ||
| 377 | d_nl_langinfo='define' | ||
| 378 | d_nv_zero_is_allbits_zero='define' | ||
| 379 | d_off64_t='define' | ||
| 380 | d_old_pthread_create_joinable='undef' | ||
| 381 | d_oldpthreads='undef' | ||
| 382 | d_oldsock='undef' | ||
| 383 | d_open3='define' | ||
| 384 | d_pathconf='define' | ||
| 385 | d_pause='define' | ||
| 386 | d_perl_otherlibdirs='define' | ||
| 387 | d_phostname='undef' | ||
| 388 | d_pipe='define' | ||
| 389 | d_poll='define' | ||
| 390 | d_portable='define' | ||
| 391 | d_procselfexe='define' | ||
| 392 | d_pseudofork='undef' | ||
| 393 | d_pthread_atfork='define' | ||
| 394 | d_pthread_attr_setscope='define' | ||
| 395 | d_pthread_yield='define' | ||
| 396 | d_pwage='undef' | ||
| 397 | d_pwchange='undef' | ||
| 398 | d_pwclass='undef' | ||
| 399 | d_pwcomment='undef' | ||
| 400 | d_pwexpire='undef' | ||
| 401 | d_pwgecos='define' | ||
| 402 | d_pwpasswd='define' | ||
| 403 | d_pwquota='undef' | ||
| 404 | d_qgcvt='define' | ||
| 405 | d_quad='define' | ||
| 406 | d_random_r='define' | ||
| 407 | d_readdir64_r='define' | ||
| 408 | d_readdir='define' | ||
| 409 | d_readdir_r='define' | ||
| 410 | d_readlink='define' | ||
| 411 | d_readv='define' | ||
| 412 | d_recvmsg='define' | ||
| 413 | d_rename='define' | ||
| 414 | d_rewinddir='define' | ||
| 415 | d_rmdir='define' | ||
| 416 | d_safebcpy='undef' | ||
| 417 | d_safemcpy='undef' | ||
| 418 | d_sanemcmp='define' | ||
| 419 | d_sbrkproto='define' | ||
| 420 | d_scalbnl='define' | ||
| 421 | d_sched_yield='define' | ||
| 422 | d_scm_rights='define' | ||
| 423 | d_seekdir='define' | ||
| 424 | d_select='define' | ||
| 425 | d_sem='define' | ||
| 426 | d_semctl='define' | ||
| 427 | d_semctl_semid_ds='define' | ||
| 428 | d_semctl_semun='define' | ||
| 429 | d_semget='define' | ||
| 430 | d_semop='define' | ||
| 431 | d_sendmsg='define' | ||
| 432 | d_setegid='define' | ||
| 433 | d_seteuid='define' | ||
| 434 | d_setgrent='define' | ||
| 435 | d_setgrent_r='undef' | ||
| 436 | d_setgrps='define' | ||
| 437 | d_sethent='define' | ||
| 438 | d_sethostent_r='undef' | ||
| 439 | d_setitimer='define' | ||
| 440 | d_setlinebuf='define' | ||
| 441 | d_setlocale='define' | ||
| 442 | d_setlocale_r='undef' | ||
| 443 | d_setnent='define' | ||
| 444 | d_setnetent_r='undef' | ||
| 445 | d_setpent='define' | ||
| 446 | d_setpgid='define' | ||
| 447 | d_setpgrp2='undef' | ||
| 448 | d_setpgrp='define' | ||
| 449 | d_setprior='define' | ||
| 450 | d_setproctitle='undef' | ||
| 451 | d_setprotoent_r='undef' | ||
| 452 | d_setpwent='define' | ||
| 453 | d_setpwent_r='undef' | ||
| 454 | d_setregid='define' | ||
| 455 | d_setresgid='define' | ||
| 456 | d_setresuid='define' | ||
| 457 | d_setreuid='define' | ||
| 458 | d_setrgid='undef' | ||
| 459 | d_setruid='undef' | ||
| 460 | d_setsent='define' | ||
| 461 | d_setservent_r='undef' | ||
| 462 | d_setsid='define' | ||
| 463 | d_setvbuf='define' | ||
| 464 | d_sfio='undef' | ||
| 465 | d_shm='define' | ||
| 466 | d_shmat='define' | ||
| 467 | d_shmatprototype='define' | ||
| 468 | d_shmctl='define' | ||
| 469 | d_shmdt='define' | ||
| 470 | d_shmget='define' | ||
| 471 | d_sigaction='define' | ||
| 472 | d_signbit='define' | ||
| 473 | d_sigprocmask='define' | ||
| 474 | d_sigsetjmp='define' | ||
| 475 | d_sitearch='define' | ||
| 476 | d_snprintf='define' | ||
| 477 | d_sockatmark='define' | ||
| 478 | d_sockatmarkproto='define' | ||
| 479 | d_socket='define' | ||
| 480 | d_socklen_t='define' | ||
| 481 | d_sockpair='define' | ||
| 482 | d_socks5_init='undef' | ||
| 483 | d_sprintf_returns_strlen='define' | ||
| 484 | d_sqrtl='define' | ||
| 485 | d_srand48_r='define' | ||
| 486 | d_srandom_r='define' | ||
| 487 | d_sresgproto='define' | ||
| 488 | d_sresuproto='define' | ||
| 489 | d_statblks='define' | ||
| 490 | d_statfs_f_flags='undef' | ||
| 491 | d_statfs_s='define' | ||
| 492 | d_statvfs='define' | ||
| 493 | d_stdio_cnt_lval='undef' | ||
| 494 | d_stdio_ptr_lval='define' | ||
| 495 | d_stdio_ptr_lval_nochange_cnt='undef' | ||
| 496 | d_stdio_ptr_lval_sets_cnt='define' | ||
| 497 | d_stdio_stream_array='undef' | ||
| 498 | d_stdiobase='define' | ||
| 499 | d_stdstdio='define' | ||
| 500 | d_strchr='define' | ||
| 501 | d_strcoll='define' | ||
| 502 | d_strctcpy='define' | ||
| 503 | d_strerrm='strerror(e)' | ||
| 504 | d_strerror='define' | ||
| 505 | d_strerror_r='define' | ||
| 506 | d_strftime='define' | ||
| 507 | d_strlcat='undef' | ||
| 508 | d_strlcpy='undef' | ||
| 509 | d_strtod='define' | ||
| 510 | d_strtol='define' | ||
| 511 | d_strtold='define' | ||
| 512 | d_strtoll='define' | ||
| 513 | d_strtoq='define' | ||
| 514 | d_strtoul='define' | ||
| 515 | d_strtoull='define' | ||
| 516 | d_strtouq='define' | ||
| 517 | d_strxfrm='define' | ||
| 518 | d_suidsafe='undef' | ||
| 519 | d_symlink='define' | ||
| 520 | d_syscall='define' | ||
| 521 | d_syscallproto='define' | ||
| 522 | d_sysconf='define' | ||
| 523 | d_sysernlst='' | ||
| 524 | d_syserrlst='define' | ||
| 525 | d_system='define' | ||
| 526 | d_tcgetpgrp='define' | ||
| 527 | d_tcsetpgrp='define' | ||
| 528 | d_telldir='define' | ||
| 529 | d_telldirproto='define' | ||
| 530 | d_time='define' | ||
| 531 | d_timegm='define' | ||
| 532 | d_times='define' | ||
| 533 | d_tm_tm_gmtoff='define' | ||
| 534 | d_tm_tm_zone='define' | ||
| 535 | d_tmpnam_r='define' | ||
| 536 | d_truncate='define' | ||
| 537 | d_ttyname_r='define' | ||
| 538 | d_tzname='define' | ||
| 539 | d_ualarm='define' | ||
| 540 | d_umask='define' | ||
| 541 | d_uname='define' | ||
| 542 | d_union_semun='undef' | ||
| 543 | d_unordered='undef' | ||
| 544 | d_unsetenv='define' | ||
| 545 | d_usleep='define' | ||
| 546 | d_usleepproto='define' | ||
| 547 | d_ustat='define' | ||
| 548 | d_vendorarch='define' | ||
| 549 | d_vendorbin='define' | ||
| 550 | d_vendorlib='define' | ||
| 551 | d_vendorscript='define' | ||
| 552 | d_vfork='undef' | ||
| 553 | d_void_closedir='undef' | ||
| 554 | d_voidsig='define' | ||
| 555 | d_voidtty='' | ||
| 556 | d_volatile='define' | ||
| 557 | d_vprintf='define' | ||
| 558 | d_vsnprintf='define' | ||
| 559 | d_wait4='define' | ||
| 560 | d_waitpid='define' | ||
| 561 | d_wcstombs='define' | ||
| 562 | d_wctomb='define' | ||
| 563 | d_writev='define' | ||
| 564 | d_xenix='undef' | ||
| 565 | date='date' | ||
| 566 | db_hashtype='u_int32_t' | ||
| 567 | db_prefixtype='size_t' | ||
| 568 | db_version_major='' | ||
| 569 | db_version_minor='' | ||
| 570 | db_version_patch='' | ||
| 571 | defvoidused='15' | ||
| 572 | direntrytype='struct dirent' | ||
| 573 | dlext='so' | ||
| 574 | dlsrc='dl_dlopen.xs' | ||
| 575 | doublesize='8' | ||
| 576 | drand01='drand48()' | ||
| 577 | drand48_r_proto='REENTRANT_PROTO_I_ST' | ||
| 578 | dtrace='' | ||
| 579 | dynamic_ext='B Compress/Raw/Bzip2 Compress/Raw/Zlib Cwd Data/Dumper Devel/PPPort Devel/Peek Digest/MD5 Digest/SHA Encode Fcntl File/DosGlob File/Glob Filter/Util/Call Hash/Util Hash/Util/FieldHash I18N/Langinfo IO IPC/SysV List/Util MIME/Base64 Math/BigInt/FastCalc Opcode POSIX PerlIO/encoding PerlIO/mmap PerlIO/scalar PerlIO/via SDBM_File Socket Storable Sys/Hostname Sys/Syslog Tie/Hash/NamedCapture Time/HiRes Time/Piece Unicode/Collate Unicode/Normalize XS/APItest XS/Typemap arybase attributes mro re threads threads/shared' | ||
| 580 | eagain='EAGAIN' | ||
| 581 | ebcdic='undef' | ||
| 582 | echo='echo' | ||
| 583 | egrep='egrep' | ||
| 584 | emacs='' | ||
| 585 | endgrent_r_proto='0' | ||
| 586 | endhostent_r_proto='0' | ||
| 587 | endnetent_r_proto='0' | ||
| 588 | endprotoent_r_proto='0' | ||
| 589 | endpwent_r_proto='0' | ||
| 590 | endservent_r_proto='0' | ||
| 591 | eunicefix=':' | ||
| 592 | exe_ext='' | ||
| 593 | expr='expr' | ||
| 594 | extensions='B Compress/Raw/Bzip2 Compress/Raw/Zlib Cwd Data/Dumper Devel/PPPort Devel/Peek Digest/MD5 Digest/SHA Encode Fcntl File/DosGlob File/Glob Filter/Util/Call Hash/Util Hash/Util/FieldHash I18N/Langinfo IO IPC/SysV List/Util MIME/Base64 Math/BigInt/FastCalc Opcode POSIX PerlIO/encoding PerlIO/mmap PerlIO/scalar PerlIO/via SDBM_File Socket Storable Sys/Hostname Sys/Syslog Tie/Hash/NamedCapture Time/HiRes Time/Piece Unicode/Collate Unicode/Normalize XS/APItest XS/Typemap arybase attributes mro re threads threads/shared Archive/Tar Attribute/Handlers AutoLoader B/Debug CGI CPAN CPAN/Meta CPAN/Meta/Requirements CPAN/Meta/YAML Carp Config/Perl/V Devel/SelfStubber Digest Dumpvalue Env Errno Exporter ExtUtils/CBuilder ExtUtils/Command ExtUtils/Constant ExtUtils/Install ExtUtils/MakeMaker ExtUtils/Manifest ExtUtils/Miniperl ExtUtils/ParseXS File/Fetch File/Find File/Path File/Temp FileCache Filter/Simple Getopt/Long HTTP/Tiny I18N/Collate I18N/LangTags IO/Compress IO/Socket/IP IO/Zlib IPC/Cmd IPC/Open3 JSON/PP Locale/Codes Locale/Maketext Locale/Maketext/Simple Math/BigInt Math/BigRat Math/Complex Memoize Module/Build Module/CoreList Module/Load Module/Load/Conditional Module/Loaded Module/Metadata NEXT Net/Ping Package/Constants Params/Check Parse/CPAN/Meta Perl/OSType PerlIO/via/QuotedPrint Pod/Checker Pod/Escapes Pod/Functions Pod/Html Pod/Parser Pod/Perldoc Pod/Simple Pod/Usage Safe Search/Dict SelfLoader Term/ANSIColor Term/Cap Term/Complete Term/ReadLine Test Test/Harness Test/Simple Text/Abbrev Text/Balanced Text/ParseWords Text/Tabs Thread/Queue Thread/Semaphore Tie/File Tie/Memoize Tie/RefHash Time/Local XSLoader autodie autouse base bignum constant encoding/warnings experimental if lib libnet parent perlfaq podlators version' | ||
| 595 | extern_C='extern' | ||
| 596 | extras='' | ||
| 597 | fflushNULL='define' | ||
| 598 | fflushall='undef' | ||
| 599 | find='' | ||
| 600 | firstmakefile='makefile' | ||
| 601 | flex='' | ||
| 602 | fpossize='16' | ||
| 603 | fpostype='fpos_t' | ||
| 604 | freetype='void' | ||
| 605 | from=':' | ||
| 606 | full_ar='ar' | ||
| 607 | full_csh='csh' | ||
| 608 | full_sed='sed' | ||
| 609 | gccansipedantic='' | ||
| 610 | gccosandvers='' | ||
| 611 | gccversion='4.9.0' | ||
| 612 | getgrent_r_proto='REENTRANT_PROTO_I_SBWR' | ||
| 613 | getgrgid_r_proto='REENTRANT_PROTO_I_TSBWR' | ||
| 614 | getgrnam_r_proto='REENTRANT_PROTO_I_CSBWR' | ||
| 615 | gethostbyaddr_r_proto='REENTRANT_PROTO_I_TsISBWRE' | ||
| 616 | gethostbyname_r_proto='REENTRANT_PROTO_I_CSBWRE' | ||
| 617 | gethostent_r_proto='REENTRANT_PROTO_I_SBWRE' | ||
| 618 | getlogin_r_proto='REENTRANT_PROTO_I_BW' | ||
| 619 | getnetbyaddr_r_proto='REENTRANT_PROTO_I_uISBWRE' | ||
| 620 | getnetbyname_r_proto='REENTRANT_PROTO_I_CSBWRE' | ||
| 621 | getnetent_r_proto='REENTRANT_PROTO_I_SBWRE' | ||
| 622 | getprotobyname_r_proto='REENTRANT_PROTO_I_CSBWR' | ||
| 623 | getprotobynumber_r_proto='REENTRANT_PROTO_I_ISBWR' | ||
| 624 | getprotoent_r_proto='REENTRANT_PROTO_I_SBWR' | ||
| 625 | getpwent_r_proto='REENTRANT_PROTO_I_SBWR' | ||
| 626 | getpwnam_r_proto='REENTRANT_PROTO_I_CSBWR' | ||
| 627 | getpwuid_r_proto='REENTRANT_PROTO_I_TSBWR' | ||
| 628 | getservbyname_r_proto='REENTRANT_PROTO_I_CCSBWR' | ||
| 629 | getservbyport_r_proto='REENTRANT_PROTO_I_ICSBWR' | ||
| 630 | getservent_r_proto='REENTRANT_PROTO_I_SBWR' | ||
| 631 | getspnam_r_proto='REENTRANT_PROTO_I_CSBWR' | ||
| 632 | gidsign='1' | ||
| 633 | gidsize='4' | ||
| 634 | gidtype='gid_t' | ||
| 635 | glibpth='@EXECPREFIX@/shlib @BASELIBDIR@ @LIBDIR@ @LIBDIR@/386 @BASELIBDIR@/386 @EXECPREFIX@/ccs/lib @EXECPREFIX@/ucblib @EXECPREFIX@/local/lib ' | ||
| 636 | gmake='gmake' | ||
| 637 | gmtime_r_proto='REENTRANT_PROTO_S_TS' | ||
| 638 | gnulibc_version='2.19' | ||
| 639 | grep='grep' | ||
| 640 | groupcat='cat /etc/group' | ||
| 641 | groupstype='gid_t' | ||
| 642 | gzip='gzip' | ||
| 643 | h_fcntl='false' | ||
| 644 | h_sysfile='true' | ||
| 645 | hint='recommended' | ||
| 646 | hostcat='cat /etc/hosts' | ||
| 647 | html1dir=' ' | ||
| 648 | html1direxp='' | ||
| 649 | html3dir=' ' | ||
| 650 | html3direxp='' | ||
| 651 | i16size='2' | ||
| 652 | i16type='short' | ||
| 653 | i32size='4' | ||
| 654 | i64size='8' | ||
| 655 | i8size='1' | ||
| 656 | i8type='signed char' | ||
| 657 | i_arpainet='define' | ||
| 658 | i_assert='define' | ||
| 659 | i_bsdioctl='' | ||
| 660 | i_crypt='define' | ||
| 661 | i_db='undef' | ||
| 662 | i_dbm='undef' | ||
| 663 | i_dirent='define' | ||
| 664 | i_dld='undef' | ||
| 665 | i_dlfcn='define' | ||
| 666 | i_fcntl='undef' | ||
| 667 | i_float='define' | ||
| 668 | i_fp='undef' | ||
| 669 | i_fp_class='undef' | ||
| 670 | i_gdbm='undef' | ||
| 671 | i_gdbm_ndbm='undef' | ||
| 672 | i_gdbmndbm='undef' | ||
| 673 | i_grp='define' | ||
| 674 | i_ieeefp='undef' | ||
| 675 | i_inttypes='define' | ||
| 676 | i_langinfo='define' | ||
| 677 | i_libutil='undef' | ||
| 678 | i_limits='define' | ||
| 679 | i_locale='define' | ||
| 680 | i_machcthr='undef' | ||
| 681 | i_malloc='define' | ||
| 682 | i_mallocmalloc='undef' | ||
| 683 | i_math='define' | ||
| 684 | i_memory='undef' | ||
| 685 | i_mntent='define' | ||
| 686 | i_ndbm='undef' | ||
| 687 | i_netdb='define' | ||
| 688 | i_neterrno='undef' | ||
| 689 | i_netinettcp='define' | ||
| 690 | i_niin='define' | ||
| 691 | i_poll='define' | ||
| 692 | i_prot='undef' | ||
| 693 | i_pthread='define' | ||
| 694 | i_pwd='define' | ||
| 695 | i_rpcsvcdbm='undef' | ||
| 696 | i_sfio='undef' | ||
| 697 | i_sgtty='undef' | ||
| 698 | i_shadow='define' | ||
| 699 | i_socks='undef' | ||
| 700 | i_stdarg='define' | ||
| 701 | i_stddef='define' | ||
| 702 | i_stdlib='define' | ||
| 703 | i_string='define' | ||
| 704 | i_sunmath='undef' | ||
| 705 | i_sysaccess='undef' | ||
| 706 | i_sysdir='define' | ||
| 707 | i_sysfile='define' | ||
| 708 | i_sysfilio='undef' | ||
| 709 | i_sysin='undef' | ||
| 710 | i_sysioctl='define' | ||
| 711 | i_syslog='define' | ||
| 712 | i_sysmman='define' | ||
| 713 | i_sysmode='undef' | ||
| 714 | i_sysmount='define' | ||
| 715 | i_sysndir='undef' | ||
| 716 | i_sysparam='define' | ||
| 717 | i_syspoll='define' | ||
| 718 | i_sysresrc='define' | ||
| 719 | i_syssecrt='undef' | ||
| 720 | i_sysselct='define' | ||
| 721 | i_syssockio='undef' | ||
| 722 | i_sysstat='define' | ||
| 723 | i_sysstatfs='define' | ||
| 724 | i_sysstatvfs='define' | ||
| 725 | i_systime='define' | ||
| 726 | i_systimek='undef' | ||
| 727 | i_systimes='define' | ||
| 728 | i_systypes='define' | ||
| 729 | i_sysuio='define' | ||
| 730 | i_sysun='define' | ||
| 731 | i_sysutsname='define' | ||
| 732 | i_sysvfs='define' | ||
| 733 | i_syswait='define' | ||
| 734 | i_termio='undef' | ||
| 735 | i_termios='define' | ||
| 736 | i_time='define' | ||
| 737 | i_unistd='define' | ||
| 738 | i_ustat='define' | ||
| 739 | i_utime='define' | ||
| 740 | i_values='define' | ||
| 741 | i_varargs='undef' | ||
| 742 | i_varhdr='stdarg.h' | ||
| 743 | i_vfork='undef' | ||
| 744 | ignore_versioned_solibs='y' | ||
| 745 | inc_version_list=' ' | ||
| 746 | inc_version_list_init='0' | ||
| 747 | incpath='' | ||
| 748 | inews='' | ||
| 749 | initialinstalllocation='@USRBIN@' | ||
| 750 | installarchlib='@LIBDIR@/perl/5.20.0/@ARCH@-thread-multi' | ||
| 751 | installbin='@USRBIN@' | ||
| 752 | installhtml1dir='' | ||
| 753 | installhtml3dir='' | ||
| 754 | installman1dir='' | ||
| 755 | installman3dir='' | ||
| 756 | installprefix='@EXECPREFIX@' | ||
| 757 | installprefixexp='@EXECPREFIX@' | ||
| 758 | installprivlib='@LIBDIR@/perl/5.20.0' | ||
| 759 | installscript='@USRBIN@' | ||
| 760 | installsitearch='@LIBDIR@/perl/site_perl/5.20.0/@ARCH@-thread-multi' | ||
| 761 | installsitebin='@USRBIN@' | ||
| 762 | installsitehtml1dir='' | ||
| 763 | installsitehtml3dir='' | ||
| 764 | installsitelib='@LIBDIR@/perl/site_perl/5.20.0' | ||
| 765 | installsiteman1dir='' | ||
| 766 | installsiteman3dir='' | ||
| 767 | installsitescript='@USRBIN@' | ||
| 768 | installstyle='lib/perl' | ||
| 769 | installusrbinperl='define' | ||
| 770 | installvendorarch='@LIBDIR@/perl/vendor_perl/5.20.0/@ARCH@-thread-multi' | ||
| 771 | installvendorbin='@USRBIN@' | ||
| 772 | installvendorhtml1dir='' | ||
| 773 | installvendorhtml3dir='' | ||
| 774 | installvendorlib='@LIBDIR@/perl/vendor_perl/5.20.0' | ||
| 775 | installvendorman1dir='' | ||
| 776 | installvendorman3dir='' | ||
| 777 | installvendorscript='@USRBIN@' | ||
| 778 | intsize='4' | ||
| 779 | issymlink='test -h' | ||
| 780 | ivdformat='"ld"' | ||
| 781 | ivtype='long' | ||
| 782 | known_extensions='Archive/Tar Attribute/Handlers AutoLoader B B/Debug CGI CPAN CPAN/Meta CPAN/Meta/Requirements CPAN/Meta/YAML Carp Compress/Raw/Bzip2 Compress/Raw/Zlib Config/Perl/V Cwd DB_File Data/Dumper Devel/PPPort Devel/Peek Devel/SelfStubber Digest Digest/MD5 Digest/SHA Dumpvalue Encode Env Errno Exporter ExtUtils/CBuilder ExtUtils/Command ExtUtils/Constant ExtUtils/Install ExtUtils/MakeMaker ExtUtils/Manifest ExtUtils/Miniperl ExtUtils/ParseXS Fcntl File/DosGlob File/Fetch File/Find File/Glob File/Path File/Temp FileCache Filter/Simple Filter/Util/Call GDBM_File Getopt/Long HTTP/Tiny Hash/Util Hash/Util/FieldHash I18N/Collate I18N/LangTags I18N/Langinfo IO IO/Compress IO/Socket/IP IO/Zlib IPC/Cmd IPC/Open3 IPC/SysV JSON/PP List/Util Locale/Codes Locale/Maketext Locale/Maketext/Simple MIME/Base64 Math/BigInt Math/BigInt/FastCalc Math/BigRat Math/Complex Memoize Module/Build Module/CoreList Module/Load Module/Load/Conditional Module/Loaded Module/Metadata NDBM_File NEXT Net/Ping ODBM_File Opcode POSIX Package/Constants Params/Check Parse/CPAN/Meta Perl/OSType PerlIO/encoding PerlIO/mmap PerlIO/scalar PerlIO/via PerlIO/via/QuotedPrint Pod/Checker Pod/Escapes Pod/Functions Pod/Html Pod/Parser Pod/Perldoc Pod/Simple Pod/Usage SDBM_File Safe Search/Dict SelfLoader Socket Storable Sys/Hostname Sys/Syslog Term/ANSIColor Term/Cap Term/Complete Term/ReadLine Test Test/Harness Test/Simple Text/Abbrev Text/Balanced Text/ParseWords Text/Tabs Thread/Queue Thread/Semaphore Tie/File Tie/Hash/NamedCapture Tie/Memoize Tie/RefHash Time/HiRes Time/Local Time/Piece Unicode/Collate Unicode/Normalize VMS/DCLsym VMS/Filespec VMS/Stdio Win32 Win32API/File Win32CORE XS/APItest XS/Typemap XSLoader arybase attributes autodie autouse base bignum constant encoding/warnings experimental if lib libnet mro parent perlfaq podlators re threads threads/shared version ' | ||
| 783 | ksh='' | ||
| 784 | ld='gcc' | ||
| 785 | lddlflags='-shared -O2 -fstack-protector' | ||
| 786 | ldflags=' -fstack-protector' | ||
| 787 | ldflags_uselargefiles='' | ||
| 788 | ldlibpthname='LD_LIBRARY_PATH' | ||
| 789 | less='less' | ||
| 790 | lib_ext='.a' | ||
| 791 | libc='@BASELIBDIR@/libc-2.19.so' | ||
| 792 | libperl='libperl.so' | ||
| 793 | libpth='@BASELIBDIR@ @LIBDIR@' | ||
| 794 | libs='-lnsl -lgdbm -ldb -ldl -lm -lcrypt -lutil -lpthread -lc' | ||
| 795 | libsdirs=' @LIBDIR@' | ||
| 796 | libsfiles=' libnsl.so libgdbm.so libdb.so libdl.so libm.so libcrypt.so libutil.so libpthread.so libc.so' | ||
| 797 | libsfound=' @LIBDIR@/libnsl.so @LIBDIR@/libgdbm.so @LIBDIR@/libdb.so @LIBDIR@/libdl.so @LIBDIR@/libm.so @LIBDIR@/libcrypt.so @LIBDIR@/libutil.so @LIBDIR@/libpthread.so @LIBDIR@/libc.so' | ||
| 798 | libspath=' @BASELIBDIR@ @LIBDIR@' | ||
| 799 | libswanted='sfio socket inet nsl nm ndbm gdbm dbm db malloc dl dld ld sun m crypt sec util pthread c cposix posix ucb BSD gdbm_compat' | ||
| 800 | libswanted_uselargefiles='' | ||
| 801 | line='' | ||
| 802 | lint='' | ||
| 803 | lkflags='' | ||
| 804 | ln='ln' | ||
| 805 | lns='/bin/ln -s' | ||
| 806 | localtime_r_proto='REENTRANT_PROTO_S_TS' | ||
| 807 | locincpth='@EXECPREFIX@/local/include /opt/local/include @EXECPREFIX@/gnu/include /opt/gnu/include @EXECPREFIX@/GNU/include /opt/GNU/include' | ||
| 808 | loclibpth='@EXECPREFIX@/local/lib /opt/local/lib @EXECPREFIX@/gnu/lib /opt/gnu/lib @EXECPREFIX@/GNU/lib /opt/GNU/lib' | ||
| 809 | longlongsize='8' | ||
| 810 | lp='' | ||
| 811 | lpr='' | ||
| 812 | ls='ls' | ||
| 813 | lseeksize='8' | ||
| 814 | lseektype='off_t' | ||
| 815 | mad='undef' | ||
| 816 | madlyh='' | ||
| 817 | madlyobj='' | ||
| 818 | madlysrc='' | ||
| 819 | mail='' | ||
| 820 | mailx='' | ||
| 821 | make='make' | ||
| 822 | make_set_make='#' | ||
| 823 | mallocobj='' | ||
| 824 | mallocsrc='' | ||
| 825 | malloctype='void *' | ||
| 826 | man1dir=' ' | ||
| 827 | man1direxp='' | ||
| 828 | man1ext='0' | ||
| 829 | man3dir=' ' | ||
| 830 | man3direxp='' | ||
| 831 | man3ext='0' | ||
| 832 | mips_type='' | ||
| 833 | mistrustnm='' | ||
| 834 | mkdir='mkdir' | ||
| 835 | mmaptype='void *' | ||
| 836 | modetype='mode_t' | ||
| 837 | more='more' | ||
| 838 | multiarch='undef' | ||
| 839 | mv='' | ||
| 840 | myarchname='@ARCH@' | ||
| 841 | mydomain='.localdomain' | ||
| 842 | myhostname='localhost' | ||
| 843 | n='-n' | ||
| 844 | netdb_hlen_type='size_t' | ||
| 845 | netdb_name_type='const char *' | ||
| 846 | netdb_net_type='in_addr_t' | ||
| 847 | nm='nm' | ||
| 848 | nm_opt='' | ||
| 849 | nm_so_opt='--dynamic' | ||
| 850 | nonxs_ext='Archive/Tar Attribute/Handlers AutoLoader B/Debug CGI CPAN CPAN/Meta CPAN/Meta/Requirements CPAN/Meta/YAML Carp Config/Perl/V Devel/SelfStubber Digest Dumpvalue Env Errno Exporter ExtUtils/CBuilder ExtUtils/Command ExtUtils/Constant ExtUtils/Install ExtUtils/MakeMaker ExtUtils/Manifest ExtUtils/Miniperl ExtUtils/ParseXS File/Fetch File/Find File/Path File/Temp FileCache Filter/Simple Getopt/Long HTTP/Tiny I18N/Collate I18N/LangTags IO/Compress IO/Socket/IP IO/Zlib IPC/Cmd IPC/Open3 JSON/PP Locale/Codes Locale/Maketext Locale/Maketext/Simple Math/BigInt Math/BigRat Math/Complex Memoize Module/Build Module/CoreList Module/Load Module/Load/Conditional Module/Loaded Module/Metadata NEXT Net/Ping Package/Constants Params/Check Parse/CPAN/Meta Perl/OSType PerlIO/via/QuotedPrint Pod/Checker Pod/Escapes Pod/Functions Pod/Html Pod/Parser Pod/Perldoc Pod/Simple Pod/Usage Safe Search/Dict SelfLoader Term/ANSIColor Term/Cap Term/Complete Term/ReadLine Test Test/Harness Test/Simple Text/Abbrev Text/Balanced Text/ParseWords Text/Tabs Thread/Queue Thread/Semaphore Tie/File Tie/Memoize Tie/RefHash Time/Local XSLoader autodie autouse base bignum constant encoding/warnings experimental if lib libnet parent perlfaq podlators version' | ||
| 851 | nroff='nroff' | ||
| 852 | nvEUformat='"E"' | ||
| 853 | nvFUformat='"F"' | ||
| 854 | nvGUformat='"G"' | ||
| 855 | nv_overflows_integers_at='256.0*256.0*256.0*256.0*256.0*256.0*2.0*2.0*2.0*2.0*2.0' | ||
| 856 | nveformat='"e"' | ||
| 857 | nvfformat='"f"' | ||
| 858 | nvgformat='"g"' | ||
| 859 | nvsize='8' | ||
| 860 | nvtype='double' | ||
| 861 | o_nonblock='O_NONBLOCK' | ||
| 862 | obj_ext='.o' | ||
| 863 | old_pthread_create_joinable='' | ||
| 864 | optimize='-O2' | ||
| 865 | orderlib='false' | ||
| 866 | osname='linux' | ||
| 867 | osvers='3.14.5-yocto-standard' | ||
| 868 | otherlibdirs='@LIBDIR@/perl/5.20.0' | ||
| 869 | package='perl5' | ||
| 870 | pager='/usr/bin/less -isr' | ||
| 871 | passcat='cat /etc/passwd' | ||
| 872 | patchlevel='20' | ||
| 873 | path_sep=':' | ||
| 874 | perl5='@USRBIN@/perl' | ||
| 875 | perl='' | ||
| 876 | perl_patchlevel='' | ||
| 877 | perladmin='root@localhost' | ||
| 878 | perllibs='-lnsl -ldl -lm -lcrypt -lutil -lpthread -lc' | ||
| 879 | perlpath='@USRBIN@/perl' | ||
| 880 | pg='pg' | ||
| 881 | phostname='' | ||
| 882 | pidtype='pid_t' | ||
| 883 | plibpth='' | ||
| 884 | pmake='' | ||
| 885 | pr='' | ||
| 886 | prefix='@EXECPREFIX@' | ||
| 887 | prefixexp='@EXECPREFIX@' | ||
| 888 | privlib='@LIBDIR@/perl/5.20.0' | ||
| 889 | privlibexp='@LIBDIR@/perl/5.20.0' | ||
| 890 | procselfexe='"/proc/self/exe"' | ||
| 891 | prototype='define' | ||
| 892 | randbits='48' | ||
| 893 | randfunc='drand48' | ||
| 894 | random_r_proto='REENTRANT_PROTO_I_St' | ||
| 895 | randseedtype='long' | ||
| 896 | ranlib=':' | ||
| 897 | rd_nodata='-1' | ||
| 898 | readdir64_r_proto='REENTRANT_PROTO_I_TSR' | ||
| 899 | readdir_r_proto='REENTRANT_PROTO_I_TSR' | ||
| 900 | revision='5' | ||
| 901 | rm='rm' | ||
| 902 | rm_try='/bin/rm -f try try a.out .out try.[cho] try..o core core.try* try.core*' | ||
| 903 | rmail='' | ||
| 904 | run='' | ||
| 905 | runnm='false' | ||
| 906 | sPRIEUldbl='"LE"' | ||
| 907 | sPRIFUldbl='"LF"' | ||
| 908 | sPRIGUldbl='"LG"' | ||
| 909 | sPRIeldbl='"Le"' | ||
| 910 | sPRIfldbl='"Lf"' | ||
| 911 | sPRIgldbl='"Lg"' | ||
| 912 | sSCNfldbl='"Lf"' | ||
| 913 | sched_yield='sched_yield()' | ||
| 914 | scriptdir='@USRBIN@' | ||
| 915 | scriptdirexp='@USRBIN@' | ||
| 916 | sed='sed' | ||
| 917 | seedfunc='srand48' | ||
| 918 | selecttype='fd_set *' | ||
| 919 | sendmail='' | ||
| 920 | setgrent_r_proto='0' | ||
| 921 | sethostent_r_proto='0' | ||
| 922 | setlocale_r_proto='0' | ||
| 923 | setnetent_r_proto='0' | ||
| 924 | setprotoent_r_proto='0' | ||
| 925 | setpwent_r_proto='0' | ||
| 926 | setservent_r_proto='0' | ||
| 927 | sh='/bin/sh' | ||
| 928 | shar='' | ||
| 929 | sharpbang='#!' | ||
| 930 | shmattype='void *' | ||
| 931 | shortsize='2' | ||
| 932 | shrpenv='' | ||
| 933 | shsharp='true' | ||
| 934 | sig_count='65' | ||
| 935 | sig_name='ZERO HUP INT QUIT ILL TRAP ABRT BUS FPE KILL USR1 SEGV USR2 PIPE ALRM TERM STKFLT CHLD CONT STOP TSTP TTIN TTOU URG XCPU XFSZ VTALRM PROF WINCH IO PWR SYS NUM32 NUM33 RTMIN NUM35 NUM36 NUM37 NUM38 NUM39 NUM40 NUM41 NUM42 NUM43 NUM44 NUM45 NUM46 NUM47 NUM48 NUM49 NUM50 NUM51 NUM52 NUM53 NUM54 NUM55 NUM56 NUM57 NUM58 NUM59 NUM60 NUM61 NUM62 NUM63 RTMAX IOT CLD POLL UNUSED ' | ||
| 936 | sig_name_init='"ZERO", "HUP", "INT", "QUIT", "ILL", "TRAP", "ABRT", "BUS", "FPE", "KILL", "USR1", "SEGV", "USR2", "PIPE", "ALRM", "TERM", "STKFLT", "CHLD", "CONT", "STOP", "TSTP", "TTIN", "TTOU", "URG", "XCPU", "XFSZ", "VTALRM", "PROF", "WINCH", "IO", "PWR", "SYS", "NUM32", "NUM33", "RTMIN", "NUM35", "NUM36", "NUM37", "NUM38", "NUM39", "NUM40", "NUM41", "NUM42", "NUM43", "NUM44", "NUM45", "NUM46", "NUM47", "NUM48", "NUM49", "NUM50", "NUM51", "NUM52", "NUM53", "NUM54", "NUM55", "NUM56", "NUM57", "NUM58", "NUM59", "NUM60", "NUM61", "NUM62", "NUM63", "RTMAX", "IOT", "CLD", "POLL", "UNUSED", 0' | ||
| 937 | sig_num='0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 6 17 29 31 ' | ||
| 938 | sig_num_init='0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 6, 17, 29, 31, 0' | ||
| 939 | sig_size='69' | ||
| 940 | signal_t='void' | ||
| 941 | sitearch='@LIBDIR@/perl/site_perl/5.20.0/@ARCH@-thread-multi' | ||
| 942 | sitearchexp='@LIBDIR@/perl/site_perl/5.20.0/@ARCH@-thread-multi' | ||
| 943 | sitebin='@USRBIN@' | ||
| 944 | sitebinexp='@USRBIN@' | ||
| 945 | sitehtml1dir='' | ||
| 946 | sitehtml1direxp='' | ||
| 947 | sitehtml3dir='' | ||
| 948 | sitehtml3direxp='' | ||
| 949 | sitelib='@LIBDIR@/perl/site_perl/5.20.0' | ||
| 950 | sitelib_stem='@LIBDIR@/perl/site_perl' | ||
| 951 | sitelibexp='@LIBDIR@/perl/site_perl/5.20.0' | ||
| 952 | siteman1dir='' | ||
| 953 | siteman1direxp='' | ||
| 954 | siteman3dir='' | ||
| 955 | siteman3direxp='' | ||
| 956 | siteprefix='@EXECPREFIX@' | ||
| 957 | siteprefixexp='@EXECPREFIX@' | ||
| 958 | sitescript='@USRBIN@' | ||
| 959 | sitescriptexp='@USRBIN@' | ||
| 960 | sizetype='size_t' | ||
| 961 | sleep='' | ||
| 962 | smail='' | ||
| 963 | so='so' | ||
| 964 | sockethdr='' | ||
| 965 | socketlib='' | ||
| 966 | socksizetype='socklen_t' | ||
| 967 | sort='sort' | ||
| 968 | spackage='Perl5' | ||
| 969 | spitshell='cat' | ||
| 970 | srand48_r_proto='REENTRANT_PROTO_I_LS' | ||
| 971 | srandom_r_proto='REENTRANT_PROTO_I_TS' | ||
| 972 | src='.' | ||
| 973 | ssizetype='ssize_t' | ||
| 974 | startperl='#!@USRBIN@/perl' | ||
| 975 | startsh='#!/bin/sh' | ||
| 976 | static_ext=' ' | ||
| 977 | stdchar='char' | ||
| 978 | stdio_base='((fp)->_IO_read_base)' | ||
| 979 | stdio_bufsiz='((fp)->_IO_read_end - (fp)->_IO_read_base)' | ||
| 980 | stdio_cnt='((fp)->_IO_read_end - (fp)->_IO_read_ptr)' | ||
| 981 | stdio_filbuf='' | ||
| 982 | stdio_ptr='((fp)->_IO_read_ptr)' | ||
| 983 | stdio_stream_array='' | ||
| 984 | strerror_r_proto='REENTRANT_PROTO_B_IBW' | ||
| 985 | strings='@INCLUDEDIR@/string.h' | ||
| 986 | submit='' | ||
| 987 | subversion='2' | ||
| 988 | sysman='@EXECPREFIX@/share/man/man1' | ||
| 989 | tail='' | ||
| 990 | tar='' | ||
| 991 | targetarch='' | ||
| 992 | tbl='' | ||
| 993 | tee='' | ||
| 994 | test='test' | ||
| 995 | timeincl='@INCLUDEDIR@/sys/time.h @INCLUDEDIR@/time.h ' | ||
| 996 | timetype='time_t' | ||
| 997 | tmpnam_r_proto='REENTRANT_PROTO_B_B' | ||
| 998 | to=':' | ||
| 999 | touch='touch' | ||
| 1000 | tr='tr' | ||
| 1001 | trnl='\n' | ||
| 1002 | troff='' | ||
| 1003 | ttyname_r_proto='REENTRANT_PROTO_I_IBW' | ||
| 1004 | u16size='2' | ||
| 1005 | u16type='unsigned short' | ||
| 1006 | u32size='4' | ||
| 1007 | u64size='8' | ||
| 1008 | u8size='1' | ||
| 1009 | u8type='unsigned char' | ||
| 1010 | uidsign='1' | ||
| 1011 | uidsize='4' | ||
| 1012 | uidtype='uid_t' | ||
| 1013 | uname='uname' | ||
| 1014 | uniq='uniq' | ||
| 1015 | use5005threads='undef' | ||
| 1016 | usecrosscompile='define' | ||
| 1017 | usedevel='undef' | ||
| 1018 | usedl='define' | ||
| 1019 | usedtrace='undef' | ||
| 1020 | usefaststdio='undef' | ||
| 1021 | useithreads='define' | ||
| 1022 | uselargefiles='define' | ||
| 1023 | uselongdouble='undef' | ||
| 1024 | usemallocwrap='define' | ||
| 1025 | usemorebits='undef' | ||
| 1026 | usemultiplicity='define' | ||
| 1027 | usemymalloc='n' | ||
| 1028 | usenm='false' | ||
| 1029 | useopcode='true' | ||
| 1030 | useperlio='define' | ||
| 1031 | useposix='true' | ||
| 1032 | usereentrant='undef' | ||
| 1033 | userelocatableinc='undef' | ||
| 1034 | usesfio='false' | ||
| 1035 | useshrplib='true' | ||
| 1036 | usesitecustomize='undef' | ||
| 1037 | usesocks='undef' | ||
| 1038 | usethreads='define' | ||
| 1039 | usevendorprefix='define' | ||
| 1040 | usevfork='false' | ||
| 1041 | usrinc='@INCLUDEDIR@' | ||
| 1042 | uuname='' | ||
| 1043 | uvXUformat='"lX"' | ||
| 1044 | uvoformat='"lo"' | ||
| 1045 | uvtype='unsigned long' | ||
| 1046 | uvuformat='"lu"' | ||
| 1047 | uvxformat='"lx"' | ||
| 1048 | vaproto='define' | ||
| 1049 | vendorarch='@LIBDIR@/perl/vendor_perl/5.20.0/@ARCH@-thread-multi' | ||
| 1050 | vendorarchexp='@LIBDIR@/perl/vendor_perl/5.20.0/@ARCH@-thread-multi' | ||
| 1051 | vendorbin='@USRBIN@' | ||
| 1052 | vendorbinexp='@USRBIN@' | ||
| 1053 | vendorhtml1dir=' ' | ||
| 1054 | vendorhtml1direxp='' | ||
| 1055 | vendorhtml3dir=' ' | ||
| 1056 | vendorhtml3direxp='' | ||
| 1057 | vendorlib='@LIBDIR@/perl/vendor_perl/5.20.0' | ||
| 1058 | vendorlib_stem='@LIBDIR@/perl/vendor_perl' | ||
| 1059 | vendorlibexp='@LIBDIR@/perl/vendor_perl/5.20.0' | ||
| 1060 | vendorman1dir=' ' | ||
| 1061 | vendorman1direxp='' | ||
| 1062 | vendorman3dir=' ' | ||
| 1063 | vendorman3direxp='' | ||
| 1064 | vendorprefix='/usr' | ||
| 1065 | vendorprefixexp='/usr' | ||
| 1066 | vendorscript='@USRBIN@' | ||
| 1067 | vendorscriptexp='@USRBIN@' | ||
| 1068 | version='5.20.0' | ||
| 1069 | version_patchlevel_string='version 14 subversion 2' | ||
| 1070 | versiononly='undef' | ||
| 1071 | vi='' | ||
| 1072 | voidflags='15' | ||
| 1073 | xlibpth='@LIBDIR@/386 @BASELIBDIR@/386' | ||
| 1074 | yacc='yacc' | ||
| 1075 | yaccflags='' | ||
| 1076 | zcat='' | ||
| 1077 | zip='zip' | ||
| 1078 | PERL_REVISION=5 | ||
| 1079 | PERL_VERSION=20 | ||
| 1080 | PERL_SUBVERSION=0 | ||
| 1081 | PERL_API_REVISION=5 | ||
| 1082 | PERL_API_VERSION=20 | ||
| 1083 | PERL_API_SUBVERSION=0 | ||
| 1084 | PERL_PATCHLEVEL='' | ||
| 1085 | PERL_CONFIG_SH=true | ||
| 1086 | : Variables propagated from previous config.sh file. | ||
| 1087 | libdb_needs_pthread='N' | ||
| 1088 | |||
| 1089 | d_static_inline='define' | ||
| 1090 | d_sockaddr_sa_len='undef' | ||
| 1091 | d_sin6_scope_id='define' | ||
| 1092 | d_prctl='define' | ||
| 1093 | d_prctl_set_name='define' | ||
| 1094 | perl_static_inline='static __inline__' | ||
| 1095 | d_sockaddr_in6='undef' | ||
| 1096 | d_ip_mreq='undef' | ||
| 1097 | d_ip_mreq_source='undef' | ||
| 1098 | d_ipv6_mreq='undef' | ||
| 1099 | d_ipv6_mreq_source='undef' | ||
| 1100 | bootstrap_charset='undef' | ||
| 1101 | d_isblank='define' | ||
| 1102 | i_stdbool='undef' | ||
| 1103 | usekernprocpathname='undef' | ||
| 1104 | usensgetexecutablepath='undef' | ||
| 1105 | st_ino_sign='1' | ||
| 1106 | st_ino_size='4' | ||
| 1107 | |||
| 1108 | # for Time-HiRes | ||
| 1109 | d_clock_nanosleep='define' | ||
| 1110 | d_clock_gettime='define' | ||
| 1111 | d_clock_getres='define' | ||
| 1112 | d_clock='define' | ||
| 1113 | d_nanosleep='define' | ||
diff --git a/meta/recipes-devtools/perl/perl-5.20.0/config.sh-32 b/meta/recipes-devtools/perl/perl-5.20.0/config.sh-32 deleted file mode 100644 index 7259a0c6ae..0000000000 --- a/meta/recipes-devtools/perl/perl-5.20.0/config.sh-32 +++ /dev/null | |||
| @@ -1,38 +0,0 @@ | |||
| 1 | alignbytes='4' | ||
| 2 | cf_time='Thu Dec 23 03:57:51 UTC 2010' | ||
| 3 | cppsymbols='_FILE_OFFSET_BITS=64 _GNU_SOURCE=1 _LARGEFILE64_SOURCE=1 _LARGEFILE_SOURCE=1 _POSIX_C_SOURCE=200809L _POSIX_SOURCE=1 _REENTRANT=1 _XOPEN_SOURCE=700 _XOPEN_SOURCE_EXTENDED=1 __BIGGEST_ALIGNMENT__=16 __CHAR16_TYPE__=short\ unsigned\ int __CHAR32_TYPE__=unsigned\ int __CHAR_BIT__=8 __DBL_DENORM_MIN__=((double)4.94065645841246544177e-324L) __DBL_DIG__=15 __DBL_EPSILON__=((double)2.22044604925031308085e-16L) __DBL_HAS_DENORM__=1 __DBL_HAS_INFINITY__=1 __DBL_HAS_QUIET_NAN__=1 __DBL_MANT_DIG__=53 __DBL_MAX_10_EXP__=308 __DBL_MAX_EXP__=1024 __DBL_MAX__=((double)1.79769313486231570815e+308L) __DBL_MIN_10_EXP__=(-307) __DBL_MIN_EXP__=(-1021) __DBL_MIN__=((double)2.22507385850720138309e-308L) __DEC128_EPSILON__=1E-33DL __DEC128_MANT_DIG__=34 __DEC128_MAX_EXP__=6145 __DEC128_MAX__=9.999999999999999999999999999999999E6144DL __DEC128_MIN_EXP__=(-6142) __DEC128_MIN__=1E-6143DL __DEC128_SUBNORMAL_MIN__=0.000000000000000000000000000000001E-6143DL __DEC32_EPSILON__=1E-6DF __DEC32_MANT_DIG__=7 __DEC32_MAX_EXP__=97 __DEC32_MAX__=9.999999E96DF __DEC32_MIN_EXP__=(-94) __DEC32_MIN__=1E-95DF __DEC32_SUBNORMAL_MIN__=0.000001E-95DF __DEC64_EPSILON__=1E-15DD __DEC64_MANT_DIG__=16 __DEC64_MAX_EXP__=385 __DEC64_MAX__=9.999999999999999E384DD __DEC64_MIN_EXP__=(-382) __DEC64_MIN__=1E-383DD __DEC64_SUBNORMAL_MIN__=0.000000000000001E-383DD __DECIMAL_BID_FORMAT__=1 __DECIMAL_DIG__=21 __DEC_EVAL_METHOD__=2 __ELF__=1 __FINITE_MATH_ONLY__=0 __FLT_DENORM_MIN__=1.40129846432481707092e-45F __FLT_DIG__=6 __FLT_EPSILON__=1.19209289550781250000e-7F __FLT_EVAL_METHOD__=2 __FLT_HAS_DENORM__=1 __FLT_HAS_INFINITY__=1 __FLT_HAS_QUIET_NAN__=1 __FLT_MANT_DIG__=24 __FLT_MAX_10_EXP__=38 __FLT_MAX_EXP__=128 __FLT_MAX__=3.40282346638528859812e+38F __FLT_MIN_10_EXP__=(-37) __FLT_MIN_EXP__=(-125) __FLT_MIN__=1.17549435082228750797e-38F __FLT_RADIX__=2 __GCC_HAVE_SYNC_COMPARE_AND_SWAP_1=1 __GCC_HAVE_SYNC_COMPARE_AND_SWAP_2=1 __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4=1 __GCC_HAVE_SYNC_COMPARE_AND_SWAP_8=1 __GLIBC_MINOR__=12 __GLIBC__=2 __GNUC_GNU_INLINE__=1 __GNUC_MINOR__=5 __GNUC_PATCHLEVEL__=1 __GNUC__=4 __GNU_LIBRARY__=6 __GXX_ABI_VERSION=1002 __INT16_C(c)=c __INT16_MAX__=32767 __INT16_TYPE__=short\ int __INT32_C(c)=c __INT32_MAX__=2147483647 __INT32_TYPE__=int __INT64_C(c)=cLL __INT64_MAX__=9223372036854775807LL __INT64_TYPE__=long\ long\ int __INT8_C(c)=c __INT8_MAX__=127 __INT8_TYPE__=signed\ char __INTMAX_C(c)=cLL __INTMAX_MAX__=9223372036854775807LL __INTMAX_TYPE__=long\ long\ int __INTPTR_MAX__=2147483647 __INTPTR_TYPE__=int __INT_FAST16_MAX__=2147483647 __INT_FAST16_TYPE__=int __INT_FAST32_MAX__=2147483647 __INT_FAST32_TYPE__=int __INT_FAST64_MAX__=9223372036854775807LL __INT_FAST64_TYPE__=long\ long\ int __INT_FAST8_MAX__=127 __INT_FAST8_TYPE__=signed\ char __INT_LEAST16_MAX__=32767 __INT_LEAST16_TYPE__=short\ int __INT_LEAST32_MAX__=2147483647 __INT_LEAST32_TYPE__=int __INT_LEAST64_MAX__=9223372036854775807LL __INT_LEAST64_TYPE__=long\ long\ int __INT_LEAST8_MAX__=127 __INT_LEAST8_TYPE__=signed\ char __INT_MAX__=2147483647 __LDBL_DENORM_MIN__=3.64519953188247460253e-4951L __LDBL_DIG__=18 __LDBL_EPSILON__=1.08420217248550443401e-19L __LDBL_HAS_DENORM__=1 __LDBL_HAS_INFINITY__=1 __LDBL_HAS_QUIET_NAN__=1 __LDBL_MANT_DIG__=64 __LDBL_MAX_10_EXP__=4932 __LDBL_MAX_EXP__=16384 __LDBL_MAX__=1.18973149535723176502e+4932L __LDBL_MIN_10_EXP__=(-4931) __LDBL_MIN_EXP__=(-16381) __LDBL_MIN__=3.36210314311209350626e-4932L __LONG_LONG_MAX__=9223372036854775807LL __LONG_MAX__=2147483647L __PRAGMA_REDEFINE_EXTNAME=1 __PTRDIFF_MAX__=2147483647 __PTRDIFF_TYPE__=int __REGISTER_PREFIX__= __SCHAR_MAX__=127 __SHRT_MAX__=32767 __SIG_ATOMIC_MAX__=2147483647 __SIG_ATOMIC_MIN__=(-2147483647\ -\ 1) __SIG_ATOMIC_TYPE__=int __SIZEOF_DOUBLE__=8 __SIZEOF_FLOAT__=4 __SIZEOF_INT__=4 __SIZEOF_LONG_DOUBLE__=12 __SIZEOF_LONG_LONG__=8 __SIZEOF_LONG__=4 __SIZEOF_POINTER__=4 __SIZEOF_PTRDIFF_T__=4 __SIZEOF_SHORT__=2 __SIZEOF_SIZE_T__=4 __SIZEOF_WCHAR_T__=4 __SIZEOF_WINT_T__=4 __SIZE_MAX__=4294967295U __SIZE_TYPE__=unsigned\ int __STDC_HOSTED__=1 __STDC__=1 __UINT16_C(c)=c __UINT16_MAX__=65535 __UINT16_TYPE__=short\ unsigned\ int __UINT32_C(c)=cU __UINT32_MAX__=4294967295U __UINT32_TYPE__=unsigned\ int __UINT64_C(c)=cULL __UINT64_MAX__=18446744073709551615ULL __UINT64_TYPE__=long\ long\ unsigned\ int __UINT8_C(c)=c __UINT8_MAX__=255 __UINT8_TYPE__=unsigned\ char __UINTMAX_C(c)=cULL __UINTMAX_MAX__=18446744073709551615ULL __UINTMAX_TYPE__=long\ long\ unsigned\ int __UINTPTR_MAX__=4294967295U __UINTPTR_TYPE__=unsigned\ int __UINT_FAST16_MAX__=4294967295U __UINT_FAST16_TYPE__=unsigned\ int __UINT_FAST32_MAX__=4294967295U __UINT_FAST32_TYPE__=unsigned\ int __UINT_FAST64_MAX__=18446744073709551615ULL __UINT_FAST64_TYPE__=long\ long\ unsigned\ int __UINT_FAST8_MAX__=255 __UINT_FAST8_TYPE__=unsigned\ char __UINT_LEAST16_MAX__=65535 __UINT_LEAST16_TYPE__=short\ unsigned\ int __UINT_LEAST32_MAX__=4294967295U __UINT_LEAST32_TYPE__=unsigned\ int __UINT_LEAST64_MAX__=18446744073709551615ULL __UINT_LEAST64_TYPE__=long\ long\ unsigned\ int __UINT_LEAST8_MAX__=255 __UINT_LEAST8_TYPE__=unsigned\ char __USER_LABEL_PREFIX__= __USE_BSD=1 __USE_FILE_OFFSET64=1 __USE_GNU=1 __USE_LARGEFILE64=1 __USE_LARGEFILE=1 __USE_MISC=1 __USE_POSIX199309=1 __USE_POSIX199506=1 __USE_POSIX2=1 __USE_POSIX=1 __USE_REENTRANT=1 __USE_SVID=1 __USE_UNIX98=1 __USE_XOPEN=1 __USE_XOPEN_EXTENDED=1 __VERSION__="4.5.1" __WCHAR_MAX__=2147483647L __WCHAR_MIN__=(-2147483647L\ -\ 1) __WCHAR_TYPE__=long\ int __WINT_MAX__=4294967295U __WINT_MIN__=0U __WINT_TYPE__=unsigned\ int __gnu_linux__=1 __i386=1 __i386__=1 __i586=1 __i586__=1 __linux=1 __linux__=1 __pentium=1 __pentium__=1 __tune_i586__=1 __tune_pentium__=1 __unix=1 __unix__=1 i386=1 linux=1 unix=1' | ||
| 4 | d_nv_preserves_uv='define' | ||
| 5 | d_printf_format_null='define' | ||
| 6 | d_u32align='undef' | ||
| 7 | gidformat='"lu"' | ||
| 8 | i32type='long' | ||
| 9 | i64type='long long' | ||
| 10 | ivsize='4' | ||
| 11 | longdblsize='12' | ||
| 12 | longsize='4' | ||
| 13 | myuname='linux qemux86 2.6.37-rc5-yocto-standard+ #1 preempt mon dec 20 14:21:27 pst 2010 i686 gnulinux ' | ||
| 14 | need_va_copy='undef' | ||
| 15 | netdb_host_type='const void *' | ||
| 16 | nv_preserves_uv_bits='32' | ||
| 17 | ptrsize='4' | ||
| 18 | quadkind='3' | ||
| 19 | quadtype='long long' | ||
| 20 | sGMTIME_max='2147483647' | ||
| 21 | sGMTIME_min='-2147483648' | ||
| 22 | sLOCALTIME_max='2147483647' | ||
| 23 | sLOCALTIME_min='-2147483648' | ||
| 24 | sPRIXU64='"LX"' | ||
| 25 | sPRId64='"Ld"' | ||
| 26 | sPRIi64='"Li"' | ||
| 27 | sPRIo64='"Lo"' | ||
| 28 | sPRIu64='"Lu"' | ||
| 29 | sPRIx64='"Lx"' | ||
| 30 | selectminbits='32' | ||
| 31 | sizesize='4' | ||
| 32 | u32type='unsigned long' | ||
| 33 | u64type='unsigned long long' | ||
| 34 | uidformat='"lu"' | ||
| 35 | uquadtype='unsigned long long' | ||
| 36 | use64bitall='undef' | ||
| 37 | use64bitint='undef' | ||
| 38 | uvsize='4' | ||
diff --git a/meta/recipes-devtools/perl/perl-5.20.0/config.sh-32-be b/meta/recipes-devtools/perl/perl-5.20.0/config.sh-32-be deleted file mode 100644 index a59a9abb5e..0000000000 --- a/meta/recipes-devtools/perl/perl-5.20.0/config.sh-32-be +++ /dev/null | |||
| @@ -1 +0,0 @@ | |||
| 1 | byteorder='4321' | ||
diff --git a/meta/recipes-devtools/perl/perl-5.20.0/config.sh-32-le b/meta/recipes-devtools/perl/perl-5.20.0/config.sh-32-le deleted file mode 100644 index 10e4226567..0000000000 --- a/meta/recipes-devtools/perl/perl-5.20.0/config.sh-32-le +++ /dev/null | |||
| @@ -1 +0,0 @@ | |||
| 1 | byteorder='1234' | ||
diff --git a/meta/recipes-devtools/perl/perl-5.20.0/config.sh-64 b/meta/recipes-devtools/perl/perl-5.20.0/config.sh-64 deleted file mode 100644 index 6929d3a09d..0000000000 --- a/meta/recipes-devtools/perl/perl-5.20.0/config.sh-64 +++ /dev/null | |||
| @@ -1,38 +0,0 @@ | |||
| 1 | alignbytes='8' | ||
| 2 | cf_time='Thu Dec 23 02:06:42 UTC 2010' | ||
| 3 | cppsymbols='_FILE_OFFSET_BITS=64 _GNU_SOURCE=1 _LARGEFILE64_SOURCE=1 _LARGEFILE_SOURCE=1 _LP64=1 _POSIX_C_SOURCE=200809L _POSIX_SOURCE=1 _REENTRANT=1 _XOPEN_SOURCE=700 _XOPEN_SOURCE_EXTENDED=1 __BIGGEST_ALIGNMENT__=16 __CHAR16_TYPE__=short\ unsigned\ int __CHAR32_TYPE__=unsigned\ int __CHAR_BIT__=8 __DBL_DENORM_MIN__=((double)4.94065645841246544177e-324L) __DBL_DIG__=15 __DBL_EPSILON__=((double)2.22044604925031308085e-16L) __DBL_HAS_DENORM__=1 __DBL_HAS_INFINITY__=1 __DBL_HAS_QUIET_NAN__=1 __DBL_MANT_DIG__=53 __DBL_MAX_10_EXP__=308 __DBL_MAX_EXP__=1024 __DBL_MAX__=((double)1.79769313486231570815e+308L) __DBL_MIN_10_EXP__=(-307) __DBL_MIN_EXP__=(-1021) __DBL_MIN__=((double)2.22507385850720138309e-308L) __DEC128_EPSILON__=1E-33DL __DEC128_MANT_DIG__=34 __DEC128_MAX_EXP__=6145 __DEC128_MAX__=9.999999999999999999999999999999999E6144DL __DEC128_MIN_EXP__=(-6142) __DEC128_MIN__=1E-6143DL __DEC128_SUBNORMAL_MIN__=0.000000000000000000000000000000001E-6143DL __DEC32_EPSILON__=1E-6DF __DEC32_MANT_DIG__=7 __DEC32_MAX_EXP__=97 __DEC32_MAX__=9.999999E96DF __DEC32_MIN_EXP__=(-94) __DEC32_MIN__=1E-95DF __DEC32_SUBNORMAL_MIN__=0.000001E-95DF __DEC64_EPSILON__=1E-15DD __DEC64_MANT_DIG__=16 __DEC64_MAX_EXP__=385 __DEC64_MAX__=9.999999999999999E384DD __DEC64_MIN_EXP__=(-382) __DEC64_MIN__=1E-383DD __DEC64_SUBNORMAL_MIN__=0.000000000000001E-383DD __DECIMAL_BID_FORMAT__=1 __DECIMAL_DIG__=21 __DEC_EVAL_METHOD__=2 __ELF__=1 __FINITE_MATH_ONLY__=0 __FLT_DENORM_MIN__=1.40129846432481707092e-45F __FLT_DIG__=6 __FLT_EPSILON__=1.19209289550781250000e-7F __FLT_EVAL_METHOD__=0 __FLT_HAS_DENORM__=1 __FLT_HAS_INFINITY__=1 __FLT_HAS_QUIET_NAN__=1 __FLT_MANT_DIG__=24 __FLT_MAX_10_EXP__=38 __FLT_MAX_EXP__=128 __FLT_MAX__=3.40282346638528859812e+38F __FLT_MIN_10_EXP__=(-37) __FLT_MIN_EXP__=(-125) __FLT_MIN__=1.17549435082228750797e-38F __FLT_RADIX__=2 __GCC_HAVE_DWARF2_CFI_ASM=1 __GCC_HAVE_SYNC_COMPARE_AND_SWAP_1=1 __GCC_HAVE_SYNC_COMPARE_AND_SWAP_2=1 __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4=1 __GCC_HAVE_SYNC_COMPARE_AND_SWAP_8=1 __GLIBC_MINOR__=12 __GLIBC__=2 __GNUC_GNU_INLINE__=1 __GNUC_MINOR__=5 __GNUC_PATCHLEVEL__=1 __GNUC__=4 __GNU_LIBRARY__=6 __GXX_ABI_VERSION=1002 __INT16_C(c)=c __INT16_MAX__=32767 __INT16_TYPE__=short\ int __INT32_C(c)=c __INT32_MAX__=2147483647 __INT32_TYPE__=int __INT64_C(c)=cL __INT64_MAX__=9223372036854775807L __INT64_TYPE__=long\ int __INT8_C(c)=c __INT8_MAX__=127 __INT8_TYPE__=signed\ char __INTMAX_C(c)=cL __INTMAX_MAX__=9223372036854775807L __INTMAX_TYPE__=long\ int __INTPTR_MAX__=9223372036854775807L __INTPTR_TYPE__=long\ int __INT_FAST16_MAX__=9223372036854775807L __INT_FAST16_TYPE__=long\ int __INT_FAST32_MAX__=9223372036854775807L __INT_FAST32_TYPE__=long\ int __INT_FAST64_MAX__=9223372036854775807L __INT_FAST64_TYPE__=long\ int __INT_FAST8_MAX__=127 __INT_FAST8_TYPE__=signed\ char __INT_LEAST16_MAX__=32767 __INT_LEAST16_TYPE__=short\ int __INT_LEAST32_MAX__=2147483647 __INT_LEAST32_TYPE__=int __INT_LEAST64_MAX__=9223372036854775807L __INT_LEAST64_TYPE__=long\ int __INT_LEAST8_MAX__=127 __INT_LEAST8_TYPE__=signed\ char __INT_MAX__=2147483647 __LDBL_DENORM_MIN__=3.64519953188247460253e-4951L __LDBL_DIG__=18 __LDBL_EPSILON__=1.08420217248550443401e-19L __LDBL_HAS_DENORM__=1 __LDBL_HAS_INFINITY__=1 __LDBL_HAS_QUIET_NAN__=1 __LDBL_MANT_DIG__=64 __LDBL_MAX_10_EXP__=4932 __LDBL_MAX_EXP__=16384 __LDBL_MAX__=1.18973149535723176502e+4932L __LDBL_MIN_10_EXP__=(-4931) __LDBL_MIN_EXP__=(-16381) __LDBL_MIN__=3.36210314311209350626e-4932L __LONG_LONG_MAX__=9223372036854775807LL __LONG_MAX__=9223372036854775807L __LP64__=1 __MMX__=1 __PRAGMA_REDEFINE_EXTNAME=1 __PTRDIFF_MAX__=9223372036854775807L __PTRDIFF_TYPE__=long\ int __REGISTER_PREFIX__= __SCHAR_MAX__=127 __SHRT_MAX__=32767 __SIG_ATOMIC_MAX__=2147483647 __SIG_ATOMIC_MIN__=(-2147483647\ -\ 1) __SIG_ATOMIC_TYPE__=int __SIZEOF_DOUBLE__=8 __SIZEOF_FLOAT__=4 __SIZEOF_INT__=4 __SIZEOF_LONG_DOUBLE__=16 __SIZEOF_LONG_LONG__=8 __SIZEOF_LONG__=8 __SIZEOF_POINTER__=8 __SIZEOF_PTRDIFF_T__=8 __SIZEOF_SHORT__=2 __SIZEOF_SIZE_T__=8 __SIZEOF_WCHAR_T__=4 __SIZEOF_WINT_T__=4 __SIZE_MAX__=18446744073709551615UL __SIZE_TYPE__=long\ unsigned\ int __SSE2_MATH__=1 __SSE2__=1 __SSE_MATH__=1 __SSE__=1 __STDC_HOSTED__=1 __STDC__=1 __UINT16_C(c)=c __UINT16_MAX__=65535 __UINT16_TYPE__=short\ unsigned\ int __UINT32_C(c)=cU __UINT32_MAX__=4294967295U __UINT32_TYPE__=unsigned\ int __UINT64_C(c)=cUL __UINT64_MAX__=18446744073709551615UL __UINT64_TYPE__=long\ unsigned\ int __UINT8_C(c)=c __UINT8_MAX__=255 __UINT8_TYPE__=unsigned\ char __UINTMAX_C(c)=cUL __UINTMAX_MAX__=18446744073709551615UL __UINTMAX_TYPE__=long\ unsigned\ int __UINTPTR_MAX__=18446744073709551615UL __UINTPTR_TYPE__=long\ unsigned\ int __UINT_FAST16_MAX__=18446744073709551615UL __UINT_FAST16_TYPE__=long\ unsigned\ int __UINT_FAST32_MAX__=18446744073709551615UL __UINT_FAST32_TYPE__=long\ unsigned\ int __UINT_FAST64_MAX__=18446744073709551615UL __UINT_FAST64_TYPE__=long\ unsigned\ int __UINT_FAST8_MAX__=255 __UINT_FAST8_TYPE__=unsigned\ char __UINT_LEAST16_MAX__=65535 __UINT_LEAST16_TYPE__=short\ unsigned\ int __UINT_LEAST32_MAX__=4294967295U __UINT_LEAST32_TYPE__=unsigned\ int __UINT_LEAST64_MAX__=18446744073709551615UL __UINT_LEAST64_TYPE__=long\ unsigned\ int __UINT_LEAST8_MAX__=255 __UINT_LEAST8_TYPE__=unsigned\ char __USER_LABEL_PREFIX__= __USE_BSD=1 __USE_FILE_OFFSET64=1 __USE_GNU=1 __USE_LARGEFILE64=1 __USE_LARGEFILE=1 __USE_MISC=1 __USE_POSIX199309=1 __USE_POSIX199506=1 __USE_POSIX2=1 __USE_POSIX=1 __USE_REENTRANT=1 __USE_SVID=1 __USE_UNIX98=1 __USE_XOPEN=1 __USE_XOPEN_EXTENDED=1 __VERSION__="4.5.1" __WCHAR_MAX__=2147483647 __WCHAR_MIN__=(-2147483647\ -\ 1) __WCHAR_TYPE__=int __WINT_MAX__=4294967295U __WINT_MIN__=0U __WINT_TYPE__=unsigned\ int __amd64=1 __amd64__=1 __gnu_linux__=1 __k8=1 __k8__=1 __linux=1 __linux__=1 __unix=1 __unix__=1 __x86_64=1 __x86_64__=1 linux=1 unix=1' | ||
| 4 | d_nv_preserves_uv='undef' | ||
| 5 | d_printf_format_null='undef' | ||
| 6 | d_u32align='define' | ||
| 7 | gidformat='"u"' | ||
| 8 | i32type='int' | ||
| 9 | i64type='long' | ||
| 10 | ivsize='8' | ||
| 11 | longdblsize='16' | ||
| 12 | longsize='8' | ||
| 13 | myuname='linux qemux86-64 2.6.37-rc5-yocto-standard+ #1 smp preempt mon dec 20 17:19:50 pst 2010 x86_64 gnulinux ' | ||
| 14 | need_va_copy='define' | ||
| 15 | netdb_host_type='char *' | ||
| 16 | nv_preserves_uv_bits='53' | ||
| 17 | ptrsize='8' | ||
| 18 | quadkind='2' | ||
| 19 | quadtype='long' | ||
| 20 | sGMTIME_max='67768036191676799' | ||
| 21 | sGMTIME_min='-62167219200' | ||
| 22 | sLOCALTIME_max='67768036191676799' | ||
| 23 | sLOCALTIME_min='-62167219200' | ||
| 24 | sPRIXU64='"lX"' | ||
| 25 | sPRId64='"ld"' | ||
| 26 | sPRIi64='"li"' | ||
| 27 | sPRIo64='"lo"' | ||
| 28 | sPRIu64='"lu"' | ||
| 29 | sPRIx64='"lx"' | ||
| 30 | selectminbits='64' | ||
| 31 | sizesize='8' | ||
| 32 | u32type='unsigned int' | ||
| 33 | u64type='unsigned long' | ||
| 34 | uidformat='"u"' | ||
| 35 | uquadtype='unsigned long' | ||
| 36 | use64bitall='define' | ||
| 37 | use64bitint='define' | ||
| 38 | uvsize='8' | ||
diff --git a/meta/recipes-devtools/perl/perl-5.20.0/config.sh-64-be b/meta/recipes-devtools/perl/perl-5.20.0/config.sh-64-be deleted file mode 100644 index c08ce3c431..0000000000 --- a/meta/recipes-devtools/perl/perl-5.20.0/config.sh-64-be +++ /dev/null | |||
| @@ -1 +0,0 @@ | |||
| 1 | byteorder='87654321' | ||
diff --git a/meta/recipes-devtools/perl/perl-5.20.0/config.sh-64-le b/meta/recipes-devtools/perl/perl-5.20.0/config.sh-64-le deleted file mode 100644 index 277d2a9bee..0000000000 --- a/meta/recipes-devtools/perl/perl-5.20.0/config.sh-64-le +++ /dev/null | |||
| @@ -1 +0,0 @@ | |||
| 1 | byteorder='12345678' | ||
diff --git a/meta/recipes-devtools/perl/perl-5.20.0/cross-generate_uudmap.patch b/meta/recipes-devtools/perl/perl-5.20.0/cross-generate_uudmap.patch deleted file mode 100644 index a00ad61d90..0000000000 --- a/meta/recipes-devtools/perl/perl-5.20.0/cross-generate_uudmap.patch +++ /dev/null | |||
| @@ -1,15 +0,0 @@ | |||
| 1 | Upstream-Status:Inappropriate [embedded specific] | ||
| 2 | |||
| 3 | Index: perl-5.14.2/Makefile.SH | ||
| 4 | =================================================================== | ||
| 5 | --- perl-5.14.2.orig/Makefile.SH | ||
| 6 | +++ perl-5.14.2/Makefile.SH | ||
| 7 | @@ -622,7 +622,7 @@ bitcount.h: generate_uudmap$(HOST_EXE_EX | ||
| 8 | $(RUN) ./generate_uudmap$(HOST_EXE_EXT) uudmap.h bitcount.h | ||
| 9 | |||
| 10 | generate_uudmap$(HOST_EXE_EXT): generate_uudmap$(OBJ_EXT) | ||
| 11 | - $(CC) -o generate_uudmap$(EXE_EXT) $(LDFLAGS) generate_uudmap$(OBJ_EXT) $(libs) | ||
| 12 | + $(BUILD_CC) -o generate_uudmap$(EXE_EXT) generate_uudmap.c | ||
| 13 | |||
| 14 | miniperlmain$(OBJ_EXT): miniperlmain.c patchlevel.h | ||
| 15 | $(CCCMD) $(PLDLFLAGS) $*.c | ||
diff --git a/meta/recipes-devtools/perl/perl-5.20.0/debian/cpan-missing-site-dirs.diff b/meta/recipes-devtools/perl/perl-5.20.0/debian/cpan-missing-site-dirs.diff deleted file mode 100644 index a5eb71e153..0000000000 --- a/meta/recipes-devtools/perl/perl-5.20.0/debian/cpan-missing-site-dirs.diff +++ /dev/null | |||
| @@ -1,62 +0,0 @@ | |||
| 1 | From 25994ac1124566398adee13806ef9a73d2cae150 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Niko Tyni <ntyni@debian.org> | ||
| 3 | Date: Tue, 16 Oct 2012 23:07:56 +0300 | ||
| 4 | Subject: Fix CPAN::FirstTime defaults with nonexisting site dirs if a parent | ||
| 5 | is writable | ||
| 6 | |||
| 7 | The site directories do not exist on a typical Debian system. The build | ||
| 8 | systems will create them when necessary, so there's no need for a prompt | ||
| 9 | suggesting local::lib if the first existing parent directory is writable. | ||
| 10 | |||
| 11 | Also, writability of the core directories is not interesting as we | ||
| 12 | explicitly tell CPAN not to touch those with INSTALLDIRS=site. | ||
| 13 | |||
| 14 | Bug-Debian: http://bugs.debian.org/688842 | ||
| 15 | Patch-Name: debian/cpan-missing-site-dirs.diff | ||
| 16 | --- | ||
| 17 | cpan/CPAN/lib/CPAN/FirstTime.pm | 31 +++++++++++++++++++++++++++---- | ||
| 18 | 1 file changed, 27 insertions(+), 4 deletions(-) | ||
| 19 | |||
| 20 | diff --git a/cpan/CPAN/lib/CPAN/FirstTime.pm b/cpan/CPAN/lib/CPAN/FirstTime.pm | ||
| 21 | index 4416072..187f5c4 100644 | ||
| 22 | --- a/cpan/CPAN/lib/CPAN/FirstTime.pm | ||
| 23 | +++ b/cpan/CPAN/lib/CPAN/FirstTime.pm | ||
| 24 | @@ -2045,11 +2045,34 @@ sub _print_urllist { | ||
| 25 | }; | ||
| 26 | } | ||
| 27 | |||
| 28 | +# Debian modification: return true if this directory | ||
| 29 | +# or the first existing one upwards is writable | ||
| 30 | +sub _can_write_to_this_or_parent { | ||
| 31 | + my ($dir) = @_; | ||
| 32 | + my @parts = File::Spec->splitdir($dir); | ||
| 33 | + while (@parts) { | ||
| 34 | + my $cur = File::Spec->catdir(@parts); | ||
| 35 | + return 1 if -w $cur; | ||
| 36 | + return 0 if -e _; | ||
| 37 | + pop @parts; | ||
| 38 | + } | ||
| 39 | + return 0; | ||
| 40 | +} | ||
| 41 | + | ||
| 42 | +# Debian specific modification: the site directories don't necessarily | ||
| 43 | +# exist on the system, but the build systems create them when necessary, | ||
| 44 | +# so return true if the first existing directory upwards is writable | ||
| 45 | +# | ||
| 46 | +# Furthermore, on Debian, only test the site directories | ||
| 47 | +# (installsite*, expanded to /usr/local/{share,lib}/perl), | ||
| 48 | +# not the core ones | ||
| 49 | +# (install*lib, expanded to /usr/{share,lib}/perl). | ||
| 50 | +# We pass INSTALLDIRS=site by default to keep CPAN from touching | ||
| 51 | +# the core directories. | ||
| 52 | + | ||
| 53 | sub _can_write_to_libdirs { | ||
| 54 | - return -w $Config{installprivlib} | ||
| 55 | - && -w $Config{installarchlib} | ||
| 56 | - && -w $Config{installsitelib} | ||
| 57 | - && -w $Config{installsitearch} | ||
| 58 | + return _can_write_to_this_or_parent($Config{installsitelib}) | ||
| 59 | + && _can_write_to_this_or_parent($Config{installsitearch}) | ||
| 60 | } | ||
| 61 | |||
| 62 | sub _using_installbase { | ||
diff --git a/meta/recipes-devtools/perl/perl-5.20.0/debian/cpan_definstalldirs.diff b/meta/recipes-devtools/perl/perl-5.20.0/debian/cpan_definstalldirs.diff deleted file mode 100644 index 77a2ee9940..0000000000 --- a/meta/recipes-devtools/perl/perl-5.20.0/debian/cpan_definstalldirs.diff +++ /dev/null | |||
| @@ -1,37 +0,0 @@ | |||
| 1 | From 64c9ad40c26f051a275a8b963cc849ca0ddd3cbb Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Brendan O'Dea <bod@debian.org> | ||
| 3 | Date: Tue, 8 Mar 2005 19:30:38 +1100 | ||
| 4 | Subject: Provide a sensible INSTALLDIRS default for modules installed from | ||
| 5 | CPAN. | ||
| 6 | |||
| 7 | Some modules which are included in core set INSTALLDIRS => 'perl' | ||
| 8 | explicitly in Makefile.PL or Build.PL. This makes sense for the normal @INC | ||
| 9 | ordering, but not ours. | ||
| 10 | |||
| 11 | Patch-Name: debian/cpan_definstalldirs.diff | ||
| 12 | --- | ||
| 13 | cpan/CPAN/lib/CPAN/FirstTime.pm | 4 ++-- | ||
| 14 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
| 15 | |||
| 16 | diff --git a/cpan/CPAN/lib/CPAN/FirstTime.pm b/cpan/CPAN/lib/CPAN/FirstTime.pm | ||
| 17 | index d1a8eef..4416072 100644 | ||
| 18 | --- a/cpan/CPAN/lib/CPAN/FirstTime.pm | ||
| 19 | +++ b/cpan/CPAN/lib/CPAN/FirstTime.pm | ||
| 20 | @@ -1023,7 +1023,7 @@ sub init { | ||
| 21 | my_prompt_loop(prefer_installer => 'MB', $matcher, 'MB|EUMM|RAND'); | ||
| 22 | |||
| 23 | if (!$matcher or 'makepl_arg make_arg' =~ /$matcher/) { | ||
| 24 | - my_dflt_prompt(makepl_arg => "", $matcher); | ||
| 25 | + my_dflt_prompt(makepl_arg => "INSTALLDIRS=site", $matcher); | ||
| 26 | my_dflt_prompt(make_arg => "", $matcher); | ||
| 27 | if ( $CPAN::Config->{makepl_arg} =~ /LIBS=|INC=/ ) { | ||
| 28 | $CPAN::Frontend->mywarn( | ||
| 29 | @@ -1055,7 +1055,7 @@ sub init { | ||
| 30 | my_dflt_prompt(make_install_arg => $CPAN::Config->{make_arg} || "", | ||
| 31 | $matcher); | ||
| 32 | |||
| 33 | - my_dflt_prompt(mbuildpl_arg => "", $matcher); | ||
| 34 | + my_dflt_prompt(mbuildpl_arg => "--installdirs site", $matcher); | ||
| 35 | my_dflt_prompt(mbuild_arg => "", $matcher); | ||
| 36 | |||
| 37 | if (exists $CPAN::HandleConfig::keys{mbuild_install_build_command} | ||
diff --git a/meta/recipes-devtools/perl/perl-5.20.0/debian/db_file_ver.diff b/meta/recipes-devtools/perl/perl-5.20.0/debian/db_file_ver.diff deleted file mode 100644 index 9557560a1c..0000000000 --- a/meta/recipes-devtools/perl/perl-5.20.0/debian/db_file_ver.diff +++ /dev/null | |||
| @@ -1,34 +0,0 @@ | |||
| 1 | From 4da39e2ce6c5a510409c2da1c7b24e0e7ff87f31 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Brendan O'Dea <bod@debian.org> | ||
| 3 | Date: Fri, 16 Dec 2005 01:32:14 +1100 | ||
| 4 | Subject: Remove overly restrictive DB_File version check. | ||
| 5 | |||
| 6 | Bug-Debian: http://bugs.debian.org/340047 | ||
| 7 | |||
| 8 | Package dependencies ensure the correct library is linked at run-time. | ||
| 9 | |||
| 10 | Patch-Name: debian/db_file_ver.diff | ||
| 11 | --- | ||
| 12 | cpan/DB_File/version.c | 2 ++ | ||
| 13 | 1 file changed, 2 insertions(+) | ||
| 14 | |||
| 15 | diff --git a/cpan/DB_File/version.c b/cpan/DB_File/version.c | ||
| 16 | index e01f6f6..544e6ee 100644 | ||
| 17 | --- a/cpan/DB_File/version.c | ||
| 18 | +++ b/cpan/DB_File/version.c | ||
| 19 | @@ -48,6 +48,7 @@ __getBerkeleyDBInfo() | ||
| 20 | |||
| 21 | (void)db_version(&Major, &Minor, &Patch) ; | ||
| 22 | |||
| 23 | +#ifndef DEBIAN | ||
| 24 | /* Check that the versions of db.h and libdb.a are the same */ | ||
| 25 | if (Major != DB_VERSION_MAJOR || Minor != DB_VERSION_MINOR ) | ||
| 26 | /* || Patch != DB_VERSION_PATCH) */ | ||
| 27 | @@ -55,6 +56,7 @@ __getBerkeleyDBInfo() | ||
| 28 | croak("\nDB_File was build with libdb version %d.%d.%d,\nbut you are attempting to run it with libdb version %d.%d.%d\n", | ||
| 29 | DB_VERSION_MAJOR, DB_VERSION_MINOR, DB_VERSION_PATCH, | ||
| 30 | Major, Minor, Patch) ; | ||
| 31 | +#endif /* DEBIAN */ | ||
| 32 | |||
| 33 | /* check that libdb is recent enough -- we need 2.3.4 or greater */ | ||
| 34 | if (Major == 2 && (Minor < 3 || (Minor == 3 && Patch < 4))) | ||
diff --git a/meta/recipes-devtools/perl/perl-5.20.0/debian/doc_info.diff b/meta/recipes-devtools/perl/perl-5.20.0/debian/doc_info.diff deleted file mode 100644 index 7643759667..0000000000 --- a/meta/recipes-devtools/perl/perl-5.20.0/debian/doc_info.diff +++ /dev/null | |||
| @@ -1,35 +0,0 @@ | |||
| 1 | From 2f3e4b35da039600de403083b5a0c7391751d02e Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Brendan O'Dea <bod@debian.org> | ||
| 3 | Date: Fri, 18 Mar 2005 22:22:25 +1100 | ||
| 4 | Subject: Replace generic man(1) instructions with Debian-specific information. | ||
| 5 | |||
| 6 | Indicate that the user needs to install the perl-doc package. | ||
| 7 | |||
| 8 | Patch-Name: debian/doc_info.diff | ||
| 9 | --- | ||
| 10 | pod/perl.pod | 12 ++++++++++-- | ||
| 11 | 1 file changed, 10 insertions(+), 2 deletions(-) | ||
| 12 | |||
| 13 | diff --git a/pod/perl.pod b/pod/perl.pod | ||
| 14 | index 2e8d0d8..8810769 100644 | ||
| 15 | --- a/pod/perl.pod | ||
| 16 | +++ b/pod/perl.pod | ||
| 17 | @@ -274,8 +274,16 @@ aux a2p c2ph h2ph h2xs perlbug pl2pm pod2html pod2man s2p splain xsubpp | ||
| 18 | |||
| 19 | =for buildtoc __END__ | ||
| 20 | |||
| 21 | -On a Unix-like system, these documentation files will usually also be | ||
| 22 | -available as manpages for use with the F<man> program. | ||
| 23 | +On Debian systems, you need to install the B<perl-doc> package which | ||
| 24 | +contains the majority of the standard Perl documentation and the | ||
| 25 | +F<perldoc> program. | ||
| 26 | + | ||
| 27 | +Extensive additional documentation for Perl modules is available, both | ||
| 28 | +those distributed with Perl and third-party modules which are packaged | ||
| 29 | +or locally installed. | ||
| 30 | + | ||
| 31 | +You should be able to view Perl's documentation with your man(1) | ||
| 32 | +program or perldoc(1). | ||
| 33 | |||
| 34 | Some documentation is not available as man pages, so if a | ||
| 35 | cross-reference is not found by man, try it with L<perldoc>. Perldoc can | ||
diff --git a/meta/recipes-devtools/perl/perl-5.20.0/debian/enc2xs_inc.diff b/meta/recipes-devtools/perl/perl-5.20.0/debian/enc2xs_inc.diff deleted file mode 100644 index 4650b0bef8..0000000000 --- a/meta/recipes-devtools/perl/perl-5.20.0/debian/enc2xs_inc.diff +++ /dev/null | |||
| @@ -1,70 +0,0 @@ | |||
| 1 | From 98e7248580af353d781b24715b42af5b6a4caf35 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Brendan O'Dea <bod@debian.org> | ||
| 3 | Date: Tue, 8 Mar 2005 19:30:38 +1100 | ||
| 4 | Subject: Tweak enc2xs to follow symlinks and ignore missing @INC directories. | ||
| 5 | |||
| 6 | Bug-Debian: http://bugs.debian.org/290336 | ||
| 7 | |||
| 8 | - ignore missing directories, | ||
| 9 | - follow symlinks (/usr/share/perl/5.8 -> 5.8.4). | ||
| 10 | - filter "." out when running "enc2xs -C", it's unnecessary and causes | ||
| 11 | issues with follow => 1 (see #603686 and [rt.cpan.org #64585]) | ||
| 12 | |||
| 13 | Patch-Name: debian/enc2xs_inc.diff | ||
| 14 | --- | ||
| 15 | cpan/Encode/bin/enc2xs | 8 ++++---- | ||
| 16 | t/porting/customized.t | 3 +++ | ||
| 17 | 2 files changed, 7 insertions(+), 4 deletions(-) | ||
| 18 | |||
| 19 | diff --git a/cpan/Encode/bin/enc2xs b/cpan/Encode/bin/enc2xs | ||
| 20 | index c44487d..a9af54f 100644 | ||
| 21 | --- a/cpan/Encode/bin/enc2xs | ||
| 22 | +++ b/cpan/Encode/bin/enc2xs | ||
| 23 | @@ -929,11 +929,11 @@ use vars qw( | ||
| 24 | sub find_e2x{ | ||
| 25 | eval { require File::Find; }; | ||
| 26 | my (@inc, %e2x_dir); | ||
| 27 | - for my $inc (@INC){ | ||
| 28 | + for my $inc (grep -d, @INC){ | ||
| 29 | push @inc, $inc unless $inc eq '.'; #skip current dir | ||
| 30 | } | ||
| 31 | File::Find::find( | ||
| 32 | - sub { | ||
| 33 | + { wanted => sub { | ||
| 34 | my ($dev,$ino,$mode,$nlink,$uid,$gid,$rdev,$size, | ||
| 35 | $atime,$mtime,$ctime,$blksize,$blocks) | ||
| 36 | = lstat($_) or return; | ||
| 37 | @@ -943,7 +943,7 @@ sub find_e2x{ | ||
| 38 | $e2x_dir{$File::Find::dir} ||= $mtime; | ||
| 39 | } | ||
| 40 | return; | ||
| 41 | - }, @inc); | ||
| 42 | + }, follow => 1}, @inc); | ||
| 43 | warn join("\n", keys %e2x_dir), "\n"; | ||
| 44 | for my $d (sort {$e2x_dir{$a} <=> $e2x_dir{$b}} keys %e2x_dir){ | ||
| 45 | $_E2X = $d; | ||
| 46 | @@ -1010,7 +1010,7 @@ sub make_configlocal_pm { | ||
| 47 | $LocalMod{$enc} ||= $mod; | ||
| 48 | } | ||
| 49 | }; | ||
| 50 | - File::Find::find({wanted => $wanted}, @INC); | ||
| 51 | + File::Find::find({wanted => $wanted, follow => 1}, grep -d && !/^\./, @INC); | ||
| 52 | $_ModLines = ""; | ||
| 53 | for my $enc ( sort keys %LocalMod ) { | ||
| 54 | $_ModLines .= | ||
| 55 | diff --git a/t/porting/customized.t b/t/porting/customized.t | ||
| 56 | index a769c58..6b9977f 100644 | ||
| 57 | --- a/t/porting/customized.t | ||
| 58 | +++ b/t/porting/customized.t | ||
| 59 | @@ -99,8 +99,11 @@ foreach my $module ( sort keys %Modules ) { | ||
| 60 | print $data_fh join(' ', $module, $file, $id), "\n"; | ||
| 61 | next; | ||
| 62 | } | ||
| 63 | +SKIP: { | ||
| 64 | + skip("$file modified for Debian", 1) if $file eq 'cpan/Encode/bin/enc2xs'; | ||
| 65 | my $should_be = $customised{ $module }->{ $file }; | ||
| 66 | is( $id, $should_be, "SHA for $file matches stashed SHA" ); | ||
| 67 | +} | ||
| 68 | } | ||
| 69 | } | ||
| 70 | |||
diff --git a/meta/recipes-devtools/perl/perl-5.20.0/debian/errno_ver.diff b/meta/recipes-devtools/perl/perl-5.20.0/debian/errno_ver.diff deleted file mode 100644 index d8885a70b1..0000000000 --- a/meta/recipes-devtools/perl/perl-5.20.0/debian/errno_ver.diff +++ /dev/null | |||
| @@ -1,35 +0,0 @@ | |||
| 1 | From 81255b67014bda2ec127e0856436acfa554a068c Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Brendan O'Dea <bod@debian.org> | ||
| 3 | Date: Fri, 16 Dec 2005 01:32:14 +1100 | ||
| 4 | Subject: Remove Errno version check due to upgrade problems with long-running | ||
| 5 | processes. | ||
| 6 | |||
| 7 | Bug-Debian: http://bugs.debian.org/343351 | ||
| 8 | |||
| 9 | Remove version check which can cause problems for long running | ||
| 10 | processes embedding perl when upgrading to a newer version, | ||
| 11 | compatible, but built on a different machine. | ||
| 12 | |||
| 13 | Patch-Name: debian/errno_ver.diff | ||
| 14 | --- | ||
| 15 | ext/Errno/Errno_pm.PL | 5 ----- | ||
| 16 | 1 file changed, 5 deletions(-) | ||
| 17 | |||
| 18 | diff --git a/ext/Errno/Errno_pm.PL b/ext/Errno/Errno_pm.PL | ||
| 19 | index 55ad01a..e4a31ef 100644 | ||
| 20 | --- a/ext/Errno/Errno_pm.PL | ||
| 21 | +++ b/ext/Errno/Errno_pm.PL | ||
| 22 | @@ -277,13 +277,8 @@ sub write_errno_pm { | ||
| 23 | |||
| 24 | package Errno; | ||
| 25 | require Exporter; | ||
| 26 | -use Config; | ||
| 27 | use strict; | ||
| 28 | |||
| 29 | -"\$Config{'archname'}-\$Config{'osvers'}" eq | ||
| 30 | -"$archname-$Config{'osvers'}" or | ||
| 31 | - die "Errno architecture ($archname-$Config{'osvers'}) does not match executable architecture (\$Config{'archname'}-\$Config{'osvers'})"; | ||
| 32 | - | ||
| 33 | our \$VERSION = "$VERSION"; | ||
| 34 | \$VERSION = eval \$VERSION; | ||
| 35 | our \@ISA = 'Exporter'; | ||
diff --git a/meta/recipes-devtools/perl/perl-5.20.0/debian/extutils_set_libperl_path.diff b/meta/recipes-devtools/perl/perl-5.20.0/debian/extutils_set_libperl_path.diff deleted file mode 100644 index 53fd1f616e..0000000000 --- a/meta/recipes-devtools/perl/perl-5.20.0/debian/extutils_set_libperl_path.diff +++ /dev/null | |||
| @@ -1,37 +0,0 @@ | |||
| 1 | From 2870b992e4b5e8bb0b9c44c9aff81adaaf9de439 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Niko Tyni <ntyni@debian.org> | ||
| 3 | Date: Sat, 10 May 2014 23:34:14 +0300 | ||
| 4 | Subject: EU:MM: set location of libperl.a under /usr/lib | ||
| 5 | |||
| 6 | The Debian packaging moves libperl.a a couple of levels up from the | ||
| 7 | CORE directory to match other static libraries. | ||
| 8 | |||
| 9 | Patch-Name: debian/extutils_set_libperl_path.diff | ||
| 10 | --- | ||
| 11 | cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm | 2 +- | ||
| 12 | pp.c | 2 +- | ||
| 13 | 2 files changed, 2 insertions(+), 2 deletions(-) | ||
| 14 | |||
| 15 | diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm | ||
| 16 | index 8b86a24..f977476 100644 | ||
| 17 | --- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm | ||
| 18 | +++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm | ||
| 19 | @@ -2462,7 +2462,7 @@ MAP_PRELIBS = $Config{perllibs} $Config{cryptlib} | ||
| 20 | ($lperl = $libperl) =~ s/\$\(A\)/$self->{LIB_EXT}/; | ||
| 21 | } | ||
| 22 | unless ($libperl && -f $lperl) { # Ilya's code... | ||
| 23 | - my $dir = $self->{PERL_SRC} || "$self->{PERL_ARCHLIB}/CORE"; | ||
| 24 | + my $dir = $self->{PERL_SRC} || "$self->{PERL_ARCHLIB}/../.."; | ||
| 25 | $dir = "$self->{PERL_ARCHLIB}/.." if $self->{UNINSTALLED_PERL}; | ||
| 26 | $libperl ||= "libperl$self->{LIB_EXT}"; | ||
| 27 | $libperl = "$dir/$libperl"; | ||
| 28 | diff --git a/pp.c b/pp.c | ||
| 29 | index 4ec6887..a44c137 100644 | ||
| 30 | --- a/pp.c | ||
| 31 | +++ b/pp.c | ||
| 32 | @@ -1,4 +1,4 @@ | ||
| 33 | -/* pp.c | ||
| 34 | + /* pp.c | ||
| 35 | * | ||
| 36 | * Copyright (C) 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, | ||
| 37 | * 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 by Larry Wall and others | ||
diff --git a/meta/recipes-devtools/perl/perl-5.20.0/debian/find_html2text.diff b/meta/recipes-devtools/perl/perl-5.20.0/debian/find_html2text.diff deleted file mode 100644 index c0e1949f5f..0000000000 --- a/meta/recipes-devtools/perl/perl-5.20.0/debian/find_html2text.diff +++ /dev/null | |||
| @@ -1,35 +0,0 @@ | |||
| 1 | From 8deb14b24ee17694a2f23a78e8782b24c116daae Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Andreas Marschke <andreas.marschke@googlemail.com> | ||
| 3 | Date: Sat, 17 Sep 2011 11:38:42 +0100 | ||
| 4 | Subject: Configure CPAN::Distribution with correct name of html2text | ||
| 5 | |||
| 6 | Bug-Debian: http://bugs.debian.org/640479 | ||
| 7 | Patch-Name: debian/find_html2text.diff | ||
| 8 | |||
| 9 | If you use cpan from Debian you usually wind up trying to read online | ||
| 10 | documentation through it. Unfortunately cpan can't find the | ||
| 11 | html2text.pl script even though it is installed using the Debian | ||
| 12 | package 'html2text'. | ||
| 13 | |||
| 14 | Please see the attached patch for a quick fix of this issue. | ||
| 15 | |||
| 16 | [Maintainer's note: html2text in Debian is not the same implementation | ||
| 17 | as the html2text.pl which is expected, but should provide similar | ||
| 18 | functionality]. | ||
| 19 | --- | ||
| 20 | cpan/CPAN/lib/CPAN/Distribution.pm | 2 +- | ||
| 21 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 22 | |||
| 23 | diff --git a/cpan/CPAN/lib/CPAN/Distribution.pm b/cpan/CPAN/lib/CPAN/Distribution.pm | ||
| 24 | index 9a08707..332a627 100644 | ||
| 25 | --- a/cpan/CPAN/lib/CPAN/Distribution.pm | ||
| 26 | +++ b/cpan/CPAN/lib/CPAN/Distribution.pm | ||
| 27 | @@ -4031,7 +4031,7 @@ sub _display_url { | ||
| 28 | if $CPAN::DEBUG; | ||
| 29 | |||
| 30 | # should we define it in the config instead? | ||
| 31 | - my $html_converter = "html2text.pl"; | ||
| 32 | + my $html_converter = "html2text"; | ||
| 33 | |||
| 34 | my $web_browser = $CPAN::Config->{'lynx'} || undef; | ||
| 35 | my $web_browser_out = $web_browser | ||
diff --git a/meta/recipes-devtools/perl/perl-5.20.0/debian/fixes/document_makemaker_ccflags.diff b/meta/recipes-devtools/perl/perl-5.20.0/debian/fixes/document_makemaker_ccflags.diff deleted file mode 100644 index f4050c01f4..0000000000 --- a/meta/recipes-devtools/perl/perl-5.20.0/debian/fixes/document_makemaker_ccflags.diff +++ /dev/null | |||
| @@ -1,31 +0,0 @@ | |||
| 1 | From c7ffe0cc3105cb627fbbb7d0c7dbb53f1f236a17 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Niko Tyni <ntyni@debian.org> | ||
| 3 | Date: Mon, 30 May 2011 22:54:24 +0300 | ||
| 4 | Subject: Document that CCFLAGS should include $Config{ccflags} | ||
| 5 | |||
| 6 | Bug: https://rt.cpan.org/Public/Bug/Display.html?id=68613 | ||
| 7 | Bug-Debian: http://bugs.debian.org/628522 | ||
| 8 | |||
| 9 | Compiling XS extensions without $Config{ccflags} can break the | ||
| 10 | binary interface on some platforms. | ||
| 11 | |||
| 12 | Patch-Name: fixes/document_makemaker_ccflags.diff | ||
| 13 | --- | ||
| 14 | cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm | 4 ++++ | ||
| 15 | 1 file changed, 4 insertions(+) | ||
| 16 | |||
| 17 | diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm | ||
| 18 | index d2fabf6..fabb021 100644 | ||
| 19 | --- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm | ||
| 20 | +++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm | ||
| 21 | @@ -1716,6 +1716,10 @@ currently used by MakeMaker but may be handy in Makefile.PLs. | ||
| 22 | String that will be included in the compiler call command line between | ||
| 23 | the arguments INC and OPTIMIZE. | ||
| 24 | |||
| 25 | +The default value is taken from $Config{ccflags}. When overriding | ||
| 26 | +CCFLAGS, make sure to include the $Config{ccflags} settings to avoid | ||
| 27 | +binary incompatibilities. | ||
| 28 | + | ||
| 29 | =item CONFIG | ||
| 30 | |||
| 31 | Arrayref. E.g. [qw(archname manext)] defines ARCHNAME & MANEXT from | ||
diff --git a/meta/recipes-devtools/perl/perl-5.20.0/debian/fixes/memoize_storable_nstore.diff b/meta/recipes-devtools/perl/perl-5.20.0/debian/fixes/memoize_storable_nstore.diff deleted file mode 100644 index b9d61c713e..0000000000 --- a/meta/recipes-devtools/perl/perl-5.20.0/debian/fixes/memoize_storable_nstore.diff +++ /dev/null | |||
| @@ -1,110 +0,0 @@ | |||
| 1 | From 8b7b31d6b2368717514a05dc0e968c1357511733 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Jonathan Nieder <jrnieder@gmail.com> | ||
| 3 | Date: Fri, 27 Jul 2012 10:35:07 -0500 | ||
| 4 | Subject: Memoize::Storable: respect 'nstore' option not respected | ||
| 5 | MIME-Version: 1.0 | ||
| 6 | Content-Type: text/plain; charset=UTF-8 | ||
| 7 | Content-Transfer-Encoding: 8bit | ||
| 8 | |||
| 9 | Memoize(3perl) says: | ||
| 10 | |||
| 11 | tie my %cache => 'Memoize::Storable', $filename, 'nstore'; | ||
| 12 | memoize 'function', SCALAR_CACHE => [HASH => \%cache]; | ||
| 13 | |||
| 14 | Include the ‘nstore’ option to have the "Storable" database | ||
| 15 | written in ‘network order’. (See Storable for more details | ||
| 16 | about this.) | ||
| 17 | |||
| 18 | In fact the "nstore" option does no such thing. Option parsing looks | ||
| 19 | like this: | ||
| 20 | |||
| 21 | @options{@_} = (); | ||
| 22 | |||
| 23 | $self->{OPTIONS}{'nstore'} is accordingly set to undef. Later | ||
| 24 | Memoize::Storable checks if the option is true, and since undef is | ||
| 25 | not true, the "else" branch is always taken. | ||
| 26 | |||
| 27 | if ($self->{OPTIONS}{'nstore'}) { | ||
| 28 | Storable::nstore($self->{H}, $self->{FILENAME}); | ||
| 29 | } else { | ||
| 30 | Storable::store($self->{H}, $self->{FILENAME}); | ||
| 31 | } | ||
| 32 | |||
| 33 | Correcting the condition to (exists $self->{OPTIONS}{'nstore'}) fixes | ||
| 34 | it. | ||
| 35 | |||
| 36 | Noticed because git-svn, which uses the 'nstore' option for its | ||
| 37 | on-disk caches, was producing | ||
| 38 | |||
| 39 | Byte order is not compatible at ../../lib/Storable.pm | ||
| 40 | |||
| 41 | when run using a perl with a different integer size (and hence | ||
| 42 | byteorder). | ||
| 43 | |||
| 44 | Reported by Tim Retout (RT#77790) | ||
| 45 | |||
| 46 | Bug-Debian: http://bugs.debian.org/587650 | ||
| 47 | Bug: https://rt.cpan.org/Public/Bug/Display.html?id=77790 | ||
| 48 | Forwarded: https://rt.cpan.org/Public/Bug/Display.html?id=77790 | ||
| 49 | Patch-Name: fixes/memoize_storable_nstore.diff | ||
| 50 | --- | ||
| 51 | cpan/Memoize/Memoize/Storable.pm | 2 +- | ||
| 52 | cpan/Memoize/t/tie_storable.t | 24 ++++++++++++++++++++---- | ||
| 53 | 2 files changed, 21 insertions(+), 5 deletions(-) | ||
| 54 | |||
| 55 | diff --git a/cpan/Memoize/Memoize/Storable.pm b/cpan/Memoize/Memoize/Storable.pm | ||
| 56 | index 1314797..87876f2 100644 | ||
| 57 | --- a/cpan/Memoize/Memoize/Storable.pm | ||
| 58 | +++ b/cpan/Memoize/Memoize/Storable.pm | ||
| 59 | @@ -55,7 +55,7 @@ sub DESTROY { | ||
| 60 | require Carp if $Verbose; | ||
| 61 | my $self= shift; | ||
| 62 | print STDERR "Memoize::Storable::DESTROY(@_)\n" if $Verbose; | ||
| 63 | - if ($self->{OPTIONS}{'nstore'}) { | ||
| 64 | + if (exists $self->{OPTIONS}{'nstore'}) { | ||
| 65 | Storable::nstore($self->{H}, $self->{FILENAME}); | ||
| 66 | } else { | ||
| 67 | Storable::store($self->{H}, $self->{FILENAME}); | ||
| 68 | diff --git a/cpan/Memoize/t/tie_storable.t b/cpan/Memoize/t/tie_storable.t | ||
| 69 | index de3b8dc..a624238 100644 | ||
| 70 | --- a/cpan/Memoize/t/tie_storable.t | ||
| 71 | +++ b/cpan/Memoize/t/tie_storable.t | ||
| 72 | @@ -31,18 +31,34 @@ if ($@) { | ||
| 73 | exit 0; | ||
| 74 | } | ||
| 75 | |||
| 76 | -print "1..4\n"; | ||
| 77 | +print "1..9\n"; | ||
| 78 | |||
| 79 | $file = "storable$$"; | ||
| 80 | 1 while unlink $file; | ||
| 81 | tryout('Memoize::Storable', $file, 1); # Test 1..4 | ||
| 82 | 1 while unlink $file; | ||
| 83 | +tryout('Memoize::Storable', $file, 5, 'nstore'); # Test 5..8 | ||
| 84 | +assert_netorder($file, 9); # Test 9 | ||
| 85 | +1 while unlink $file; | ||
| 86 | + | ||
| 87 | + | ||
| 88 | +sub assert_netorder { | ||
| 89 | + my ($file, $testno) = @_; | ||
| 90 | + | ||
| 91 | + my $netorder = Storable::file_magic($file)->{'netorder'}; | ||
| 92 | + print ($netorder ? "ok $testno\n" : "not ok $testno\n"); | ||
| 93 | +} | ||
| 94 | |||
| 95 | sub tryout { | ||
| 96 | - my ($tiepack, $file, $testno) = @_; | ||
| 97 | + my ($tiepack, $file, $testno, $option) = @_; | ||
| 98 | |||
| 99 | - tie my %cache => $tiepack, $file | ||
| 100 | - or die $!; | ||
| 101 | + if (defined $option) { | ||
| 102 | + tie my %cache => $tiepack, $file, $option | ||
| 103 | + or die $!; | ||
| 104 | + } else { | ||
| 105 | + tie my %cache => $tiepack, $file | ||
| 106 | + or die $!; | ||
| 107 | + } | ||
| 108 | |||
| 109 | memoize 'c5', | ||
| 110 | SCALAR_CACHE => [HASH => \%cache], | ||
diff --git a/meta/recipes-devtools/perl/perl-5.20.0/debian/fixes/net_smtp_docs.diff b/meta/recipes-devtools/perl/perl-5.20.0/debian/fixes/net_smtp_docs.diff deleted file mode 100644 index b7ccc5757c..0000000000 --- a/meta/recipes-devtools/perl/perl-5.20.0/debian/fixes/net_smtp_docs.diff +++ /dev/null | |||
| @@ -1,25 +0,0 @@ | |||
| 1 | From e2e1127a521d942bd9aea4c1290cdf46c15c35fd Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Brendan O'Dea <bod@debian.org> | ||
| 3 | Date: Thu, 20 Sep 2007 19:47:14 +1000 | ||
| 4 | Subject: Document the Net::SMTP 'Port' option | ||
| 5 | |||
| 6 | Bug-Debian: http://bugs.debian.org/100195 | ||
| 7 | Bug: http://rt.cpan.org/Public/Bug/Display.html?id=36038 | ||
| 8 | |||
| 9 | Patch-Name: fixes/net_smtp_docs.diff | ||
| 10 | --- | ||
| 11 | cpan/libnet/Net/SMTP.pm | 1 + | ||
| 12 | 1 file changed, 1 insertion(+) | ||
| 13 | |||
| 14 | diff --git a/cpan/libnet/Net/SMTP.pm b/cpan/libnet/Net/SMTP.pm | ||
| 15 | index 705b5c5..17c1d21 100644 | ||
| 16 | --- a/cpan/libnet/Net/SMTP.pm | ||
| 17 | +++ b/cpan/libnet/Net/SMTP.pm | ||
| 18 | @@ -637,6 +637,7 @@ Net::SMTP will attempt to extract the address from the value passed. | ||
| 19 | |||
| 20 | B<Debug> - Enable debugging information | ||
| 21 | |||
| 22 | +B<Port> - Select a port on the remote host to connect to (default is 25) | ||
| 23 | |||
| 24 | Example: | ||
| 25 | |||
diff --git a/meta/recipes-devtools/perl/perl-5.20.0/debian/fixes/respect_umask.diff b/meta/recipes-devtools/perl/perl-5.20.0/debian/fixes/respect_umask.diff deleted file mode 100644 index e5f116abd4..0000000000 --- a/meta/recipes-devtools/perl/perl-5.20.0/debian/fixes/respect_umask.diff +++ /dev/null | |||
| @@ -1,153 +0,0 @@ | |||
| 1 | From f290a5ebd91e89d63b2a1958420f53e22d20c4ee Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Brendan O'Dea <bod@debian.org> | ||
| 3 | Date: Tue, 8 Mar 2005 19:30:38 +1100 | ||
| 4 | Subject: Respect umask during installation | ||
| 5 | |||
| 6 | This is needed to satisfy Debian policy regarding group-writable | ||
| 7 | site directories. | ||
| 8 | |||
| 9 | Patch-Name: fixes/respect_umask.diff | ||
| 10 | --- | ||
| 11 | cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm | 18 +++++++++--------- | ||
| 12 | dist/ExtUtils-Install/lib/ExtUtils/Install.pm | 18 +++++++++--------- | ||
| 13 | 2 files changed, 18 insertions(+), 18 deletions(-) | ||
| 14 | |||
| 15 | diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm | ||
| 16 | index 4140432..8fdb67c 100644 | ||
| 17 | --- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm | ||
| 18 | +++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm | ||
| 19 | @@ -2075,7 +2075,7 @@ doc__install : doc_site_install | ||
| 20 | $(NOECHO) $(ECHO) INSTALLDIRS not defined, defaulting to INSTALLDIRS=site | ||
| 21 | |||
| 22 | pure_perl_install :: all | ||
| 23 | - $(NOECHO) $(MOD_INSTALL) \ | ||
| 24 | + $(NOECHO) umask 022; $(MOD_INSTALL) \ | ||
| 25 | }; | ||
| 26 | |||
| 27 | push @m, | ||
| 28 | @@ -2095,7 +2095,7 @@ q{ $(INST_LIB) $(DESTINSTALLPRIVLIB) \ | ||
| 29 | |||
| 30 | |||
| 31 | pure_site_install :: all | ||
| 32 | - $(NOECHO) $(MOD_INSTALL) \ | ||
| 33 | + $(NOECHO) umask 022; $(MOD_INSTALL) \ | ||
| 34 | }; | ||
| 35 | push @m, | ||
| 36 | q{ read }.$self->catfile('$(SITEARCHEXP)','auto','$(FULLEXT)','.packlist').q{ \ | ||
| 37 | @@ -2113,7 +2113,7 @@ q{ $(INST_LIB) $(DESTINSTALLSITELIB) \ | ||
| 38 | }.$self->catdir('$(PERL_ARCHLIB)','auto','$(FULLEXT)').q{ | ||
| 39 | |||
| 40 | pure_vendor_install :: all | ||
| 41 | - $(NOECHO) $(MOD_INSTALL) \ | ||
| 42 | + $(NOECHO) umask 022; $(MOD_INSTALL) \ | ||
| 43 | }; | ||
| 44 | push @m, | ||
| 45 | q{ read }.$self->catfile('$(VENDORARCHEXP)','auto','$(FULLEXT)','.packlist').q{ \ | ||
| 46 | @@ -2145,8 +2145,8 @@ doc_vendor_install :: all | ||
| 47 | push @m, q{ | ||
| 48 | doc_perl_install :: all | ||
| 49 | $(NOECHO) $(ECHO) Appending installation info to $(DESTINSTALLARCHLIB)/perllocal.pod | ||
| 50 | - -$(NOECHO) $(MKPATH) $(DESTINSTALLARCHLIB) | ||
| 51 | - -$(NOECHO) $(DOC_INSTALL) \ | ||
| 52 | + -$(NOECHO) umask 022; $(MKPATH) $(DESTINSTALLARCHLIB) | ||
| 53 | + -$(NOECHO) umask 022; $(DOC_INSTALL) \ | ||
| 54 | "Module" "$(NAME)" \ | ||
| 55 | "installed into" "$(INSTALLPRIVLIB)" \ | ||
| 56 | LINKTYPE "$(LINKTYPE)" \ | ||
| 57 | @@ -2156,8 +2156,8 @@ doc_perl_install :: all | ||
| 58 | |||
| 59 | doc_site_install :: all | ||
| 60 | $(NOECHO) $(ECHO) Appending installation info to $(DESTINSTALLARCHLIB)/perllocal.pod | ||
| 61 | - -$(NOECHO) $(MKPATH) $(DESTINSTALLARCHLIB) | ||
| 62 | - -$(NOECHO) $(DOC_INSTALL) \ | ||
| 63 | + -$(NOECHO) umask 022; $(MKPATH) $(DESTINSTALLARCHLIB) | ||
| 64 | + -$(NOECHO) umask 022; $(DOC_INSTALL) \ | ||
| 65 | "Module" "$(NAME)" \ | ||
| 66 | "installed into" "$(INSTALLSITELIB)" \ | ||
| 67 | LINKTYPE "$(LINKTYPE)" \ | ||
| 68 | @@ -2167,8 +2167,8 @@ doc_site_install :: all | ||
| 69 | |||
| 70 | doc_vendor_install :: all | ||
| 71 | $(NOECHO) $(ECHO) Appending installation info to $(DESTINSTALLARCHLIB)/perllocal.pod | ||
| 72 | - -$(NOECHO) $(MKPATH) $(DESTINSTALLARCHLIB) | ||
| 73 | - -$(NOECHO) $(DOC_INSTALL) \ | ||
| 74 | + -$(NOECHO) umask 022; $(MKPATH) $(DESTINSTALLARCHLIB) | ||
| 75 | + -$(NOECHO) umask 022; $(DOC_INSTALL) \ | ||
| 76 | "Module" "$(NAME)" \ | ||
| 77 | "installed into" "$(INSTALLVENDORLIB)" \ | ||
| 78 | LINKTYPE "$(LINKTYPE)" \ | ||
| 79 | diff --git a/dist/ExtUtils-Install/lib/ExtUtils/Install.pm b/dist/ExtUtils-Install/lib/ExtUtils/Install.pm | ||
| 80 | index eec57aa..06cc530 100644 | ||
| 81 | --- a/dist/ExtUtils-Install/lib/ExtUtils/Install.pm | ||
| 82 | +++ b/dist/ExtUtils-Install/lib/ExtUtils/Install.pm | ||
| 83 | @@ -450,7 +450,7 @@ sub _can_write_dir { | ||
| 84 | |||
| 85 | =pod | ||
| 86 | |||
| 87 | -=item _mkpath($dir,$show,$mode,$verbose,$dry_run) | ||
| 88 | +=item _mkpath($dir,$show,$verbose,$dry_run) | ||
| 89 | |||
| 90 | Wrapper around File::Path::mkpath() to handle errors. | ||
| 91 | |||
| 92 | @@ -467,13 +467,13 @@ writable. | ||
| 93 | =cut | ||
| 94 | |||
| 95 | sub _mkpath { | ||
| 96 | - my ($dir,$show,$mode,$verbose,$dry_run)=@_; | ||
| 97 | + my ($dir,$show,$verbose,$dry_run)=@_; | ||
| 98 | if ( $verbose && $verbose > 1 && ! -d $dir) { | ||
| 99 | $show= 1; | ||
| 100 | - printf "mkpath(%s,%d,%#o)\n", $dir, $show, $mode; | ||
| 101 | + printf "mkpath(%s,%d)\n", $dir, $show; | ||
| 102 | } | ||
| 103 | if (!$dry_run) { | ||
| 104 | - if ( ! eval { File::Path::mkpath($dir,$show,$mode); 1 } ) { | ||
| 105 | + if ( ! eval { File::Path::mkpath($dir,$show); 1 } ) { | ||
| 106 | _choke("Can't create '$dir'","$@"); | ||
| 107 | } | ||
| 108 | |||
| 109 | @@ -782,7 +782,7 @@ sub install { #XXX OS-SPECIFIC | ||
| 110 | _chdir($cwd); | ||
| 111 | } | ||
| 112 | foreach my $targetdir (sort keys %check_dirs) { | ||
| 113 | - _mkpath( $targetdir, 0, 0755, $verbose, $dry_run ); | ||
| 114 | + _mkpath( $targetdir, 0, $verbose, $dry_run ); | ||
| 115 | } | ||
| 116 | foreach my $found (@found_files) { | ||
| 117 | my ($diff, $ffd, $origfile, $mode, $size, $atime, $mtime, | ||
| 118 | @@ -796,7 +796,7 @@ sub install { #XXX OS-SPECIFIC | ||
| 119 | $targetfile= _unlink_or_rename( $targetfile, 'tryhard', 'install' ) | ||
| 120 | unless $dry_run; | ||
| 121 | } elsif ( ! -d $targetdir ) { | ||
| 122 | - _mkpath( $targetdir, 0, 0755, $verbose, $dry_run ); | ||
| 123 | + _mkpath( $targetdir, 0, $verbose, $dry_run ); | ||
| 124 | } | ||
| 125 | print "Installing $targetfile\n"; | ||
| 126 | |||
| 127 | @@ -836,7 +836,7 @@ sub install { #XXX OS-SPECIFIC | ||
| 128 | |||
| 129 | if ($pack{'write'}) { | ||
| 130 | $dir = install_rooted_dir(dirname($pack{'write'})); | ||
| 131 | - _mkpath( $dir, 0, 0755, $verbose, $dry_run ); | ||
| 132 | + _mkpath( $dir, 0, $verbose, $dry_run ); | ||
| 133 | print "Writing $pack{'write'}\n" if $verbose; | ||
| 134 | $packlist->write(install_rooted_file($pack{'write'})) unless $dry_run; | ||
| 135 | } | ||
| 136 | @@ -1176,7 +1176,7 @@ be prepended as a directory to each installed file (and directory). | ||
| 137 | sub pm_to_blib { | ||
| 138 | my($fromto,$autodir,$pm_filter) = @_; | ||
| 139 | |||
| 140 | - _mkpath($autodir,0,0755); | ||
| 141 | + _mkpath($autodir,0); | ||
| 142 | while(my($from, $to) = each %$fromto) { | ||
| 143 | if( -f $to && -s $from == -s $to && -M $to < -M $from ) { | ||
| 144 | print "Skip $to (unchanged)\n"; | ||
| 145 | @@ -1199,7 +1199,7 @@ sub pm_to_blib { | ||
| 146 | # we wont try hard here. its too likely to mess things up. | ||
| 147 | forceunlink($to); | ||
| 148 | } else { | ||
| 149 | - _mkpath(dirname($to),0,0755); | ||
| 150 | + _mkpath(dirname($to),0); | ||
| 151 | } | ||
| 152 | if ($need_filtering) { | ||
| 153 | run_filter($pm_filter, $from, $to); | ||
diff --git a/meta/recipes-devtools/perl/perl-5.20.0/debian/hurd_test_skip_stack.diff b/meta/recipes-devtools/perl/perl-5.20.0/debian/hurd_test_skip_stack.diff deleted file mode 100644 index 66208a2661..0000000000 --- a/meta/recipes-devtools/perl/perl-5.20.0/debian/hurd_test_skip_stack.diff +++ /dev/null | |||
| @@ -1,32 +0,0 @@ | |||
| 1 | From 651aaac47361c03d15681b6cfdba0056a348fbb7 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Dominic Hargreaves <dom@earth.li> | ||
| 3 | Date: Sun, 27 Nov 2011 16:27:07 +0000 | ||
| 4 | Subject: Disable failing GNU/Hurd tests dist/threads/t/stack.t | ||
| 5 | |||
| 6 | These tests fail on GNU/Hurd owing to libpthread using fixed-size stacks. | ||
| 7 | This is a known limitation that should get fixed in the future. | ||
| 8 | |||
| 9 | For now, disable the tests. | ||
| 10 | |||
| 11 | Bug-Debian: http://bugs.debian.org/650175 | ||
| 12 | |||
| 13 | Patch-Name: debian/hurd_test_skip_stack.diff | ||
| 14 | --- | ||
| 15 | dist/threads/t/stack.t | 4 ++++ | ||
| 16 | 1 file changed, 4 insertions(+) | ||
| 17 | |||
| 18 | diff --git a/dist/threads/t/stack.t b/dist/threads/t/stack.t | ||
| 19 | index cfd6cf7..84cc527 100644 | ||
| 20 | --- a/dist/threads/t/stack.t | ||
| 21 | +++ b/dist/threads/t/stack.t | ||
| 22 | @@ -7,6 +7,10 @@ BEGIN { | ||
| 23 | print("1..0 # SKIP Perl not compiled with 'useithreads'\n"); | ||
| 24 | exit(0); | ||
| 25 | } | ||
| 26 | + if ($^O eq 'gnu') { | ||
| 27 | + print("1..0 # SKIP fails on GNU/Hurd (Debian #650175)\n"); | ||
| 28 | + exit(0); | ||
| 29 | + } | ||
| 30 | } | ||
| 31 | |||
| 32 | use ExtUtils::testlib; | ||
diff --git a/meta/recipes-devtools/perl/perl-5.20.0/debian/instmodsh_doc.diff b/meta/recipes-devtools/perl/perl-5.20.0/debian/instmodsh_doc.diff deleted file mode 100644 index 569acb8a23..0000000000 --- a/meta/recipes-devtools/perl/perl-5.20.0/debian/instmodsh_doc.diff +++ /dev/null | |||
| @@ -1,27 +0,0 @@ | |||
| 1 | From 035ae97a9c2bf8ed73031e8879a0f860797544c1 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Brendan O'Dea <bod@debian.org> | ||
| 3 | Date: Tue, 8 Mar 2005 19:30:38 +1100 | ||
| 4 | Subject: Debian policy doesn't install .packlist files for core or vendor. | ||
| 5 | |||
| 6 | Patch-Name: debian/instmodsh_doc.diff | ||
| 7 | --- | ||
| 8 | cpan/ExtUtils-MakeMaker/bin/instmodsh | 4 +++- | ||
| 9 | 1 file changed, 3 insertions(+), 1 deletion(-) | ||
| 10 | |||
| 11 | diff --git a/cpan/ExtUtils-MakeMaker/bin/instmodsh b/cpan/ExtUtils-MakeMaker/bin/instmodsh | ||
| 12 | index 8b9aa95..e551434 100644 | ||
| 13 | --- a/cpan/ExtUtils-MakeMaker/bin/instmodsh | ||
| 14 | +++ b/cpan/ExtUtils-MakeMaker/bin/instmodsh | ||
| 15 | @@ -18,9 +18,11 @@ instmodsh - A shell to examine installed modules | ||
| 16 | |||
| 17 | =head1 DESCRIPTION | ||
| 18 | |||
| 19 | -A little interface to ExtUtils::Installed to examine installed modules, | ||
| 20 | +A little interface to ExtUtils::Installed to examine locally* installed modules, | ||
| 21 | validate your packlists and even create a tarball from an installed module. | ||
| 22 | |||
| 23 | +*On Debian system, B<core> and B<vendor> modules are managed by C<dpkg>. | ||
| 24 | + | ||
| 25 | =head1 SEE ALSO | ||
| 26 | |||
| 27 | ExtUtils::Installed | ||
diff --git a/meta/recipes-devtools/perl/perl-5.20.0/debian/ld_run_path.diff b/meta/recipes-devtools/perl/perl-5.20.0/debian/ld_run_path.diff deleted file mode 100644 index fa0039f27a..0000000000 --- a/meta/recipes-devtools/perl/perl-5.20.0/debian/ld_run_path.diff +++ /dev/null | |||
| @@ -1,24 +0,0 @@ | |||
| 1 | From c089c8eb475a2018e8028e23b07defb5789a5633 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Brendan O'Dea <bod@debian.org> | ||
| 3 | Date: Fri, 18 Mar 2005 22:22:25 +1100 | ||
| 4 | Subject: Remove standard libs from LD_RUN_PATH as per Debian policy. | ||
| 5 | |||
| 6 | Patch-Name: debian/ld_run_path.diff | ||
| 7 | --- | ||
| 8 | cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm | 3 +++ | ||
| 9 | 1 file changed, 3 insertions(+) | ||
| 10 | |||
| 11 | diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm | ||
| 12 | index e39c8b2..0b933ce 100644 | ||
| 13 | --- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm | ||
| 14 | +++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm | ||
| 15 | @@ -56,6 +56,9 @@ sub _unix_os2_ext { | ||
| 16 | my ( $pwd ) = cwd(); # from Cwd.pm | ||
| 17 | my ( $found ) = 0; | ||
| 18 | |||
| 19 | + # Debian-specific: don't use LD_RUN_PATH for standard dirs | ||
| 20 | + $ld_run_path_seen{$_}++ for @libpath; | ||
| 21 | + | ||
| 22 | foreach my $thislib ( split ' ', $potential_libs ) { | ||
| 23 | |||
| 24 | # Handle possible linker path arguments. | ||
diff --git a/meta/recipes-devtools/perl/perl-5.20.0/debian/libnet_config_path.diff b/meta/recipes-devtools/perl/perl-5.20.0/debian/libnet_config_path.diff deleted file mode 100644 index 0a11cd7ae8..0000000000 --- a/meta/recipes-devtools/perl/perl-5.20.0/debian/libnet_config_path.diff +++ /dev/null | |||
| @@ -1,37 +0,0 @@ | |||
| 1 | From 54e202518f081aa42d5ff733d56c4d42395bcba4 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Brendan O'Dea <bod@debian.org> | ||
| 3 | Date: Tue, 8 Mar 2005 19:30:38 +1100 | ||
| 4 | Subject: Set location of libnet.cfg to /etc/perl/Net as /usr may not be | ||
| 5 | writable. | ||
| 6 | |||
| 7 | Patch-Name: debian/libnet_config_path.diff | ||
| 8 | --- | ||
| 9 | cpan/libnet/Net/Config.pm | 7 +++---- | ||
| 10 | 1 file changed, 3 insertions(+), 4 deletions(-) | ||
| 11 | |||
| 12 | diff --git a/cpan/libnet/Net/Config.pm b/cpan/libnet/Net/Config.pm | ||
| 13 | index ba16332..4b1ea19 100644 | ||
| 14 | --- a/cpan/libnet/Net/Config.pm | ||
| 15 | +++ b/cpan/libnet/Net/Config.pm | ||
| 16 | @@ -57,9 +57,8 @@ my %nc = ( | ||
| 17 | } | ||
| 18 | TRY_INTERNET_CONFIG | ||
| 19 | |||
| 20 | -my $file = __FILE__; | ||
| 21 | +my $file = '/etc/perl/Net/libnet.cfg'; | ||
| 22 | my $ref; | ||
| 23 | -$file =~ s/Config.pm/libnet.cfg/; | ||
| 24 | if (-f $file) { | ||
| 25 | $ref = eval { local $SIG{__DIE__}; do $file }; | ||
| 26 | if (ref($ref) eq 'HASH') { | ||
| 27 | @@ -132,8 +131,8 @@ Net::Config - Local configuration data for libnet | ||
| 28 | C<Net::Config> holds configuration data for the modules in the libnet | ||
| 29 | distribution. During installation you will be asked for these values. | ||
| 30 | |||
| 31 | -The configuration data is held globally in a file in the perl installation | ||
| 32 | -tree, but a user may override any of these values by providing their own. This | ||
| 33 | +The configuration data is held globally in C</etc/perl/Net/libnet.cfg>, | ||
| 34 | +but a user may override any of these values by providing their own. This | ||
| 35 | can be done by having a C<.libnetrc> file in their home directory. This file | ||
| 36 | should return a reference to a HASH containing the keys described below. | ||
| 37 | For example | ||
diff --git a/meta/recipes-devtools/perl/perl-5.20.0/debian/libperl_embed_doc.diff b/meta/recipes-devtools/perl/perl-5.20.0/debian/libperl_embed_doc.diff deleted file mode 100644 index 7b9bd75e6c..0000000000 --- a/meta/recipes-devtools/perl/perl-5.20.0/debian/libperl_embed_doc.diff +++ /dev/null | |||
| @@ -1,26 +0,0 @@ | |||
| 1 | From 967a87e268bd348423f72dec993eda444ce9f53d Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Brendan O'Dea <bod@debian.org> | ||
| 3 | Date: Tue, 8 Mar 2005 19:30:38 +1100 | ||
| 4 | Subject: Note that libperl-dev package is required for embedded linking | ||
| 5 | |||
| 6 | Bug-Debian: http://bugs.debian.org/186778 | ||
| 7 | |||
| 8 | Patch-Name: debian/libperl_embed_doc.diff | ||
| 9 | --- | ||
| 10 | lib/ExtUtils/Embed.pm | 3 +++ | ||
| 11 | 1 file changed, 3 insertions(+) | ||
| 12 | |||
| 13 | diff --git a/lib/ExtUtils/Embed.pm b/lib/ExtUtils/Embed.pm | ||
| 14 | index 3f983c1..0ec8a67 100644 | ||
| 15 | --- a/lib/ExtUtils/Embed.pm | ||
| 16 | +++ b/lib/ExtUtils/Embed.pm | ||
| 17 | @@ -296,6 +296,9 @@ and extensions in your C/C++ applications. | ||
| 18 | Typically, an application F<Makefile> will invoke C<ExtUtils::Embed> | ||
| 19 | functions while building your application. | ||
| 20 | |||
| 21 | +Note that on Debian systems the B<libperl-dev> package is required for | ||
| 22 | +compiling applications which embed an interpreter. | ||
| 23 | + | ||
| 24 | =head1 @EXPORT | ||
| 25 | |||
| 26 | C<ExtUtils::Embed> exports the following functions: | ||
diff --git a/meta/recipes-devtools/perl/perl-5.20.0/debian/mod_paths.diff b/meta/recipes-devtools/perl/perl-5.20.0/debian/mod_paths.diff deleted file mode 100644 index 49805a015f..0000000000 --- a/meta/recipes-devtools/perl/perl-5.20.0/debian/mod_paths.diff +++ /dev/null | |||
| @@ -1,99 +0,0 @@ | |||
| 1 | From f994a741e51287494ed62b10738be6856aadce71 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Brendan O'Dea <bod@debian.org> | ||
| 3 | Date: Fri, 18 Mar 2005 22:22:25 +1100 | ||
| 4 | Subject: Tweak @INC ordering for Debian | ||
| 5 | |||
| 6 | Our order is: | ||
| 7 | |||
| 8 | etc (for config files) | ||
| 9 | site (5.8.1) | ||
| 10 | vendor (all) | ||
| 11 | core (5.8.1) | ||
| 12 | site (version-indep) | ||
| 13 | site (pre-5.8.1) | ||
| 14 | |||
| 15 | The rationale being that an admin (via site), or module packager | ||
| 16 | (vendor) can chose to shadow core modules when there is a newer | ||
| 17 | version than is included in core. | ||
| 18 | |||
| 19 | Patch-Name: debian/mod_paths.diff | ||
| 20 | --- | ||
| 21 | perl.c | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ | ||
| 22 | 1 file changed, 58 insertions(+) | ||
| 23 | |||
| 24 | diff --git a/perl.c b/perl.c | ||
| 25 | index 27d0d9e..1fe2f1c 100644 | ||
| 26 | --- a/perl.c | ||
| 27 | +++ b/perl.c | ||
| 28 | @@ -4367,6 +4367,11 @@ S_init_perllib(pTHX) | ||
| 29 | INCPUSH_ADD_SUB_DIRS|INCPUSH_CAN_RELOCATE); | ||
| 30 | #endif | ||
| 31 | |||
| 32 | +#ifdef DEBIAN | ||
| 33 | + /* for configuration where /usr is mounted ro (CPAN::Config, Net::Config) */ | ||
| 34 | + S_incpush_use_sep(aTHX_ STR_WITH_LEN("/etc/perl"), 0x0); | ||
| 35 | +#endif | ||
| 36 | + | ||
| 37 | #ifdef SITEARCH_EXP | ||
| 38 | /* sitearch is always relative to sitelib on Windows for | ||
| 39 | * DLL-based path intuition to work correctly */ | ||
| 40 | @@ -4484,6 +4489,59 @@ S_init_perllib(pTHX) | ||
| 41 | INCPUSH_ADD_OLD_VERS|INCPUSH_CAN_RELOCATE); | ||
| 42 | #endif | ||
| 43 | |||
| 44 | +#ifdef DEBIAN | ||
| 45 | + /* Non-versioned site directory for local modules and for | ||
| 46 | + compatability with the previous packages' site dirs */ | ||
| 47 | + S_incpush_use_sep(aTHX_ STR_WITH_LEN("/usr/local/lib/site_perl"), | ||
| 48 | + INCPUSH_ADD_SUB_DIRS); | ||
| 49 | + | ||
| 50 | +#ifdef PERL_INC_VERSION_LIST | ||
| 51 | + { | ||
| 52 | + struct stat s; | ||
| 53 | + | ||
| 54 | + /* add small buffer in case old versions are longer than the | ||
| 55 | + current version */ | ||
| 56 | + char sitearch[sizeof(SITEARCH_EXP)+16] = SITEARCH_EXP; | ||
| 57 | + char sitelib[sizeof(SITELIB_EXP)+16] = SITELIB_EXP; | ||
| 58 | + char const *vers[] = { PERL_INC_VERSION_LIST }; | ||
| 59 | + char const **p; | ||
| 60 | + | ||
| 61 | + char *arch_vers = strrchr(sitearch, '/'); | ||
| 62 | + char *lib_vers = strrchr(sitelib, '/'); | ||
| 63 | + | ||
| 64 | + if (arch_vers && isdigit(*++arch_vers)) | ||
| 65 | + *arch_vers = 0; | ||
| 66 | + else | ||
| 67 | + arch_vers = 0; | ||
| 68 | + | ||
| 69 | + if (lib_vers && isdigit(*++lib_vers)) | ||
| 70 | + *lib_vers = 0; | ||
| 71 | + else | ||
| 72 | + lib_vers = 0; | ||
| 73 | + | ||
| 74 | + /* there is some duplication here as incpush does something | ||
| 75 | + similar internally, but required as sitearch is not a | ||
| 76 | + subdirectory of sitelib */ | ||
| 77 | + for (p = vers; *p; p++) | ||
| 78 | + { | ||
| 79 | + if (arch_vers) | ||
| 80 | + { | ||
| 81 | + strcpy(arch_vers, *p); | ||
| 82 | + if (PerlLIO_stat(sitearch, &s) >= 0 && S_ISDIR(s.st_mode)) | ||
| 83 | + S_incpush_use_sep(aTHX_ sitearch, strlen(sitearch), 0x0); | ||
| 84 | + } | ||
| 85 | + | ||
| 86 | + if (lib_vers) | ||
| 87 | + { | ||
| 88 | + strcpy(lib_vers, *p); | ||
| 89 | + if (PerlLIO_stat(sitelib, &s) >= 0 && S_ISDIR(s.st_mode)) | ||
| 90 | + S_incpush_use_sep(aTHX_ sitelib, strlen(sitelib), 0x0); | ||
| 91 | + } | ||
| 92 | + } | ||
| 93 | + } | ||
| 94 | +#endif | ||
| 95 | +#endif | ||
| 96 | + | ||
| 97 | #ifdef PERL_OTHERLIBDIRS | ||
| 98 | S_incpush_use_sep(aTHX_ STR_WITH_LEN(PERL_OTHERLIBDIRS), | ||
| 99 | INCPUSH_ADD_OLD_VERS|INCPUSH_ADD_ARCHONLY_SUB_DIRS | ||
diff --git a/meta/recipes-devtools/perl/perl-5.20.0/debian/module_build_man_extensions.diff b/meta/recipes-devtools/perl/perl-5.20.0/debian/module_build_man_extensions.diff deleted file mode 100644 index 894e9533fc..0000000000 --- a/meta/recipes-devtools/perl/perl-5.20.0/debian/module_build_man_extensions.diff +++ /dev/null | |||
| @@ -1,35 +0,0 @@ | |||
| 1 | From 333efa7c9da43d94272a872a59a6cd28da8ca245 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Niko Tyni <ntyni@debian.org> | ||
| 3 | Date: Thu, 8 May 2008 14:32:33 +0300 | ||
| 4 | Subject: Adjust Module::Build manual page extensions for the Debian Perl | ||
| 5 | policy | ||
| 6 | |||
| 7 | Bug-Debian: http://bugs.debian.org/479460 | ||
| 8 | |||
| 9 | Patch-Name: debian/module_build_man_extensions.diff | ||
| 10 | --- | ||
| 11 | cpan/Module-Build/lib/Module/Build/Base.pm | 4 ++-- | ||
| 12 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
| 13 | |||
| 14 | diff --git a/cpan/Module-Build/lib/Module/Build/Base.pm b/cpan/Module-Build/lib/Module/Build/Base.pm | ||
| 15 | index 84e137f..4422cd4 100644 | ||
| 16 | --- a/cpan/Module-Build/lib/Module/Build/Base.pm | ||
| 17 | +++ b/cpan/Module-Build/lib/Module/Build/Base.pm | ||
| 18 | @@ -3226,7 +3226,7 @@ sub manify_bin_pods { | ||
| 19 | foreach my $file (keys %$files) { | ||
| 20 | # Pod::Simple based parsers only support one document per instance. | ||
| 21 | # This is expected to change in a future version (Pod::Simple > 3.03). | ||
| 22 | - my $parser = Pod::Man->new( %podman_args ); | ||
| 23 | + my $parser = Pod::Man->new( %podman_args, section => '1p' ); # binaries go in section 1p | ||
| 24 | my $manpage = $self->man1page_name( $file ) . '.' . | ||
| 25 | $self->config( 'man1ext' ); | ||
| 26 | my $outfile = File::Spec->catfile($mandir, $manpage); | ||
| 27 | @@ -3252,7 +3252,7 @@ sub manify_lib_pods { | ||
| 28 | while (my ($file, $relfile) = each %$files) { | ||
| 29 | # Pod::Simple based parsers only support one document per instance. | ||
| 30 | # This is expected to change in a future version (Pod::Simple > 3.03). | ||
| 31 | - my $parser = Pod::Man->new( %podman_args ); | ||
| 32 | + my $parser = Pod::Man->new( %podman_args, section => '3pm' ); # libraries go in section 3pm | ||
| 33 | my $manpage = $self->man3page_name( $relfile ) . '.' . | ||
| 34 | $self->config( 'man3ext' ); | ||
| 35 | my $outfile = File::Spec->catfile( $mandir, $manpage); | ||
diff --git a/meta/recipes-devtools/perl/perl-5.20.0/debian/no_packlist_perllocal.diff b/meta/recipes-devtools/perl/perl-5.20.0/debian/no_packlist_perllocal.diff deleted file mode 100644 index 09fe1a965e..0000000000 --- a/meta/recipes-devtools/perl/perl-5.20.0/debian/no_packlist_perllocal.diff +++ /dev/null | |||
| @@ -1,93 +0,0 @@ | |||
| 1 | From 127c026bbb63907b196febf3558842d8f01e52ef Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Brendan O'Dea <bod@debian.org> | ||
| 3 | Date: Tue, 8 Mar 2005 19:30:38 +1100 | ||
| 4 | Subject: Don't install .packlist or perllocal.pod for perl or vendor | ||
| 5 | |||
| 6 | Patch-Name: debian/no_packlist_perllocal.diff | ||
| 7 | --- | ||
| 8 | cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm | 36 +++---------------------- | ||
| 9 | 1 file changed, 4 insertions(+), 32 deletions(-) | ||
| 10 | |||
| 11 | diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm | ||
| 12 | index f977476..0a6797f 100644 | ||
| 13 | --- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm | ||
| 14 | +++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm | ||
| 15 | @@ -2079,11 +2079,6 @@ pure_perl_install :: all | ||
| 16 | }; | ||
| 17 | |||
| 18 | push @m, | ||
| 19 | -q{ read }.$self->catfile('$(PERL_ARCHLIB)','auto','$(FULLEXT)','.packlist').q{ \ | ||
| 20 | - write }.$self->catfile('$(DESTINSTALLARCHLIB)','auto','$(FULLEXT)','.packlist').q{ \ | ||
| 21 | -} unless $self->{NO_PACKLIST}; | ||
| 22 | - | ||
| 23 | - push @m, | ||
| 24 | q{ $(INST_LIB) $(DESTINSTALLPRIVLIB) \ | ||
| 25 | $(INST_ARCHLIB) $(DESTINSTALLARCHLIB) \ | ||
| 26 | $(INST_BIN) $(DESTINSTALLBIN) \ | ||
| 27 | @@ -2115,10 +2110,6 @@ q{ $(INST_LIB) $(DESTINSTALLSITELIB) \ | ||
| 28 | pure_vendor_install :: all | ||
| 29 | $(NOECHO) umask 022; $(MOD_INSTALL) \ | ||
| 30 | }; | ||
| 31 | - push @m, | ||
| 32 | -q{ read }.$self->catfile('$(VENDORARCHEXP)','auto','$(FULLEXT)','.packlist').q{ \ | ||
| 33 | - write }.$self->catfile('$(DESTINSTALLVENDORARCH)','auto','$(FULLEXT)','.packlist').q{ \ | ||
| 34 | -} unless $self->{NO_PACKLIST}; | ||
| 35 | |||
| 36 | push @m, | ||
| 37 | q{ $(INST_LIB) $(DESTINSTALLVENDORLIB) \ | ||
| 38 | @@ -2144,37 +2135,19 @@ doc_vendor_install :: all | ||
| 39 | |||
| 40 | push @m, q{ | ||
| 41 | doc_perl_install :: all | ||
| 42 | - $(NOECHO) $(ECHO) Appending installation info to $(DESTINSTALLARCHLIB)/perllocal.pod | ||
| 43 | - -$(NOECHO) umask 022; $(MKPATH) $(DESTINSTALLARCHLIB) | ||
| 44 | - -$(NOECHO) umask 022; $(DOC_INSTALL) \ | ||
| 45 | - "Module" "$(NAME)" \ | ||
| 46 | - "installed into" "$(INSTALLPRIVLIB)" \ | ||
| 47 | - LINKTYPE "$(LINKTYPE)" \ | ||
| 48 | - VERSION "$(VERSION)" \ | ||
| 49 | - EXE_FILES "$(EXE_FILES)" \ | ||
| 50 | - >> }.$self->catfile('$(DESTINSTALLARCHLIB)','perllocal.pod').q{ | ||
| 51 | |||
| 52 | doc_site_install :: all | ||
| 53 | - $(NOECHO) $(ECHO) Appending installation info to $(DESTINSTALLARCHLIB)/perllocal.pod | ||
| 54 | - -$(NOECHO) umask 02; $(MKPATH) $(DESTINSTALLARCHLIB) | ||
| 55 | + $(NOECHO) $(ECHO) Appending installation info to $(DESTINSTALLSITEARCH)/perllocal.pod | ||
| 56 | + -$(NOECHO) umask 02; $(MKPATH) $(DESTINSTALLSITEARCH) | ||
| 57 | -$(NOECHO) umask 02; $(DOC_INSTALL) \ | ||
| 58 | "Module" "$(NAME)" \ | ||
| 59 | "installed into" "$(INSTALLSITELIB)" \ | ||
| 60 | LINKTYPE "$(LINKTYPE)" \ | ||
| 61 | VERSION "$(VERSION)" \ | ||
| 62 | EXE_FILES "$(EXE_FILES)" \ | ||
| 63 | - >> }.$self->catfile('$(DESTINSTALLARCHLIB)','perllocal.pod').q{ | ||
| 64 | + >> }.$self->catfile('$(DESTINSTALLSITEARCH)','perllocal.pod').q{ | ||
| 65 | |||
| 66 | doc_vendor_install :: all | ||
| 67 | - $(NOECHO) $(ECHO) Appending installation info to $(DESTINSTALLARCHLIB)/perllocal.pod | ||
| 68 | - -$(NOECHO) umask 022; $(MKPATH) $(DESTINSTALLARCHLIB) | ||
| 69 | - -$(NOECHO) umask 022; $(DOC_INSTALL) \ | ||
| 70 | - "Module" "$(NAME)" \ | ||
| 71 | - "installed into" "$(INSTALLVENDORLIB)" \ | ||
| 72 | - LINKTYPE "$(LINKTYPE)" \ | ||
| 73 | - VERSION "$(VERSION)" \ | ||
| 74 | - EXE_FILES "$(EXE_FILES)" \ | ||
| 75 | - >> }.$self->catfile('$(DESTINSTALLARCHLIB)','perllocal.pod').q{ | ||
| 76 | |||
| 77 | } unless $self->{NO_PERLLOCAL}; | ||
| 78 | |||
| 79 | @@ -2183,13 +2156,12 @@ uninstall :: uninstall_from_$(INSTALLDIRS)dirs | ||
| 80 | $(NOECHO) $(NOOP) | ||
| 81 | |||
| 82 | uninstall_from_perldirs :: | ||
| 83 | - $(NOECHO) $(UNINSTALL) }.$self->catfile('$(PERL_ARCHLIB)','auto','$(FULLEXT)','.packlist').q{ | ||
| 84 | |||
| 85 | uninstall_from_sitedirs :: | ||
| 86 | $(NOECHO) $(UNINSTALL) }.$self->catfile('$(SITEARCHEXP)','auto','$(FULLEXT)','.packlist').q{ | ||
| 87 | |||
| 88 | uninstall_from_vendordirs :: | ||
| 89 | - $(NOECHO) $(UNINSTALL) }.$self->catfile('$(VENDORARCHEXP)','auto','$(FULLEXT)','.packlist').q{ | ||
| 90 | + | ||
| 91 | }; | ||
| 92 | |||
| 93 | join("",@m); | ||
diff --git a/meta/recipes-devtools/perl/perl-5.20.0/debian/perl5db-x-terminal-emulator.patch b/meta/recipes-devtools/perl/perl-5.20.0/debian/perl5db-x-terminal-emulator.patch deleted file mode 100644 index 82a9f1a400..0000000000 --- a/meta/recipes-devtools/perl/perl-5.20.0/debian/perl5db-x-terminal-emulator.patch +++ /dev/null | |||
| @@ -1,29 +0,0 @@ | |||
| 1 | From dc495a233b95d7e3e6900845847035da8f01aa59 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Dominic Hargreaves <dom@earth.li> | ||
| 3 | Date: Sat, 14 Apr 2012 11:34:05 +0100 | ||
| 4 | Subject: Invoke x-terminal-emulator rather than xterm in perl5db.pl | ||
| 5 | |||
| 6 | In Debian systems, xterm might not exist or might not be the preferred | ||
| 7 | terminal emulator. Use x-terminal-emulator instead | ||
| 8 | |||
| 9 | Bug-Debian: http://bugs.debian.org/668490 | ||
| 10 | Forwarded: not-needed | ||
| 11 | |||
| 12 | Patch-Name: debian/perl5db-x-terminal-emulator.patch | ||
| 13 | --- | ||
| 14 | lib/perl5db.pl | 2 +- | ||
| 15 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 16 | |||
| 17 | diff --git a/lib/perl5db.pl b/lib/perl5db.pl | ||
| 18 | index 707d04d..6ac4d36 100644 | ||
| 19 | --- a/lib/perl5db.pl | ||
| 20 | +++ b/lib/perl5db.pl | ||
| 21 | @@ -6945,7 +6945,7 @@ properly set up. | ||
| 22 | sub xterm_get_fork_TTY { | ||
| 23 | ( my $name = $0 ) =~ s,^.*[/\\],,s; | ||
| 24 | open XT, | ||
| 25 | -qq[3>&1 xterm -title "Daughter Perl debugger $pids $name" -e sh -c 'tty 1>&3;\ | ||
| 26 | +qq[3>&1 x-terminal-emulator -T "Daughter Perl debugger $pids $name" -e sh -c 'tty 1>&3;\ | ||
| 27 | sleep 10000000' |]; | ||
| 28 | |||
| 29 | # Get the output from 'tty' and clean it up a little. | ||
diff --git a/meta/recipes-devtools/perl/perl-5.20.0/debian/perlivp.diff b/meta/recipes-devtools/perl/perl-5.20.0/debian/perlivp.diff deleted file mode 100644 index 60a714f8bb..0000000000 --- a/meta/recipes-devtools/perl/perl-5.20.0/debian/perlivp.diff +++ /dev/null | |||
| @@ -1,39 +0,0 @@ | |||
| 1 | From 70eb3e56e884e62bcf837c1f8cd32e35e5552889 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Niko Tyni <ntyni@debian.org> | ||
| 3 | Date: Fri, 9 Jan 2009 18:54:47 +0200 | ||
| 4 | Subject: Make perlivp skip include directories in /usr/local | ||
| 5 | |||
| 6 | Bug-Debian: http://bugs.debian.org/510895 | ||
| 7 | |||
| 8 | On Sat, Jan 10, 2009 at 12:37:18AM +1100, Brendan O'Dea wrote: | ||
| 9 | > On Wed, Jan 7, 2009 at 12:21 AM, Niko Tyni <ntyni@debian.org> wrote: | ||
| 10 | |||
| 11 | > > We could create the directories in a postinst script, but I'm not sure | ||
| 12 | > > I see the point. They will be created automatically when installing | ||
| 13 | > > CPAN modules. | ||
| 14 | > | ||
| 15 | > The directories are intentionally not created, as this way they are | ||
| 16 | > excluded from the search path at start-up, saving a bunch of wasted | ||
| 17 | > stats at use/require time in the common case that the user has not | ||
| 18 | > installed any local packages. As Niko points out, they will be | ||
| 19 | > created as required. | ||
| 20 | |||
| 21 | Signed-off-by: Niko Tyni <ntyni@debian.org> | ||
| 22 | |||
| 23 | Patch-Name: debian/perlivp.diff | ||
| 24 | --- | ||
| 25 | utils/perlivp.PL | 1 + | ||
| 26 | 1 file changed, 1 insertion(+) | ||
| 27 | |||
| 28 | diff --git a/utils/perlivp.PL b/utils/perlivp.PL | ||
| 29 | index c2f0a11..cc49f96 100644 | ||
| 30 | --- a/utils/perlivp.PL | ||
| 31 | +++ b/utils/perlivp.PL | ||
| 32 | @@ -153,6 +153,7 @@ my $INC_total = 0; | ||
| 33 | my $INC_there = 0; | ||
| 34 | foreach (@INC) { | ||
| 35 | next if $_ eq '.'; # skip -d test here | ||
| 36 | + next if m|/usr/local|; # not shipped on Debian | ||
| 37 | if (-d $_) { | ||
| 38 | print "## Perl \@INC directory '$_' exists.\n" if $opt{'v'}; | ||
| 39 | $INC_there++; | ||
diff --git a/meta/recipes-devtools/perl/perl-5.20.0/debian/prefix_changes.diff b/meta/recipes-devtools/perl/perl-5.20.0/debian/prefix_changes.diff deleted file mode 100644 index 535a90d5e2..0000000000 --- a/meta/recipes-devtools/perl/perl-5.20.0/debian/prefix_changes.diff +++ /dev/null | |||
| @@ -1,118 +0,0 @@ | |||
| 1 | From 9ff12f918da84dc355b75fbaa5374a8e276f76d7 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Brendan O'Dea <bod@debian.org> | ||
| 3 | Date: Tue, 8 Mar 2005 19:30:38 +1100 | ||
| 4 | Subject: Fiddle with *PREFIX and variables written to the makefile | ||
| 5 | |||
| 6 | Fiddle with *PREFIX and variables written to the makefile so that | ||
| 7 | install directories may be changed when make is run by passing | ||
| 8 | PREFIX= to the "make install" command (used when packaging | ||
| 9 | modules). | ||
| 10 | |||
| 11 | Patch-Name: debian/prefix_changes.diff | ||
| 12 | --- | ||
| 13 | cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Any.pm | 12 ++++++------ | ||
| 14 | cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm | 3 +-- | ||
| 15 | cpan/ExtUtils-MakeMaker/t/INST.t | 4 +--- | ||
| 16 | cpan/ExtUtils-MakeMaker/t/INST_PREFIX.t | 10 +++++----- | ||
| 17 | 4 files changed, 13 insertions(+), 16 deletions(-) | ||
| 18 | |||
| 19 | diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Any.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Any.pm | ||
| 20 | index 2066311..0a1fb49 100644 | ||
| 21 | --- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Any.pm | ||
| 22 | +++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Any.pm | ||
| 23 | @@ -765,8 +765,6 @@ all POD files in MAN1PODS and MAN3PODS. | ||
| 24 | sub manifypods_target { | ||
| 25 | my($self) = shift; | ||
| 26 | |||
| 27 | - my $man1pods = ''; | ||
| 28 | - my $man3pods = ''; | ||
| 29 | my $dependencies = ''; | ||
| 30 | |||
| 31 | # populate manXpods & dependencies: | ||
| 32 | @@ -782,7 +780,7 @@ END | ||
| 33 | foreach my $section (qw(1 3)) { | ||
| 34 | my $pods = $self->{"MAN${section}PODS"}; | ||
| 35 | push @man_cmds, $self->split_command(<<CMD, map {($_,$pods->{$_})} sort keys %$pods); | ||
| 36 | - \$(NOECHO) \$(POD2MAN) --section=$section --perm_rw=\$(PERM_RW) | ||
| 37 | + \$(NOECHO) \$(POD2MAN) --section=\$(MAN${section}EXT) --perm_rw=\$(PERM_RW) | ||
| 38 | CMD | ||
| 39 | } | ||
| 40 | |||
| 41 | @@ -1748,9 +1746,11 @@ sub init_INSTALL_from_PREFIX { | ||
| 42 | $self->{SITEPREFIX} ||= $sprefix; | ||
| 43 | $self->{VENDORPREFIX} ||= $vprefix; | ||
| 44 | |||
| 45 | - # Lots of MM extension authors like to use $(PREFIX) so we | ||
| 46 | - # put something sensible in there no matter what. | ||
| 47 | - $self->{PREFIX} = '$('.uc $self->{INSTALLDIRS}.'PREFIX)'; | ||
| 48 | + my $p = $self->{PREFIX} = $self->{PERLPREFIX}; | ||
| 49 | + for my $t (qw/PERL SITE VENDOR/) | ||
| 50 | + { | ||
| 51 | + $self->{"${t}PREFIX"} =~ s!^\Q$p\E(?=/|$)!\$(PREFIX)!; | ||
| 52 | + } | ||
| 53 | } | ||
| 54 | |||
| 55 | my $arch = $Config{archname}; | ||
| 56 | diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm | ||
| 57 | index 0a6797f..c19a5f9 100644 | ||
| 58 | --- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm | ||
| 59 | +++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm | ||
| 60 | @@ -3029,8 +3029,7 @@ sub prefixify { | ||
| 61 | warn " prefixify $var => $path\n" if $Verbose >= 2; | ||
| 62 | warn " from $sprefix to $rprefix\n" if $Verbose >= 2; | ||
| 63 | |||
| 64 | - if( $self->{ARGS}{PREFIX} && | ||
| 65 | - $path !~ s{^\Q$sprefix\E\b}{$rprefix}s ) | ||
| 66 | + if( $path !~ s{^\Q$sprefix\E\b}{$rprefix}s && $self->{ARGS}{PREFIX} ) | ||
| 67 | { | ||
| 68 | |||
| 69 | warn " cannot prefix, using default.\n" if $Verbose >= 2; | ||
| 70 | diff --git a/cpan/ExtUtils-MakeMaker/t/INST.t b/cpan/ExtUtils-MakeMaker/t/INST.t | ||
| 71 | index 91058bb..e399ced 100644 | ||
| 72 | --- a/cpan/ExtUtils-MakeMaker/t/INST.t | ||
| 73 | +++ b/cpan/ExtUtils-MakeMaker/t/INST.t | ||
| 74 | @@ -65,9 +65,7 @@ isa_ok( $mm, 'ExtUtils::MakeMaker' ); | ||
| 75 | is( $mm->{NAME}, 'Big::Dummy', 'NAME' ); | ||
| 76 | is( $mm->{VERSION}, 0.01, 'VERSION' ); | ||
| 77 | |||
| 78 | -my $config_prefix = $Config{installprefixexp} || $Config{installprefix} || | ||
| 79 | - $Config{prefixexp} || $Config{prefix}; | ||
| 80 | -is( $mm->{PERLPREFIX}, $config_prefix, 'PERLPREFIX' ); | ||
| 81 | +is( $mm->{PERLPREFIX}, '$(PREFIX)', 'PERLPREFIX' ); | ||
| 82 | |||
| 83 | is( !!$mm->{PERL_CORE}, !!$ENV{PERL_CORE}, 'PERL_CORE' ); | ||
| 84 | |||
| 85 | diff --git a/cpan/ExtUtils-MakeMaker/t/INST_PREFIX.t b/cpan/ExtUtils-MakeMaker/t/INST_PREFIX.t | ||
| 86 | index e8de7c6..3fb3f12 100644 | ||
| 87 | --- a/cpan/ExtUtils-MakeMaker/t/INST_PREFIX.t | ||
| 88 | +++ b/cpan/ExtUtils-MakeMaker/t/INST_PREFIX.t | ||
| 89 | @@ -10,7 +10,7 @@ BEGIN { | ||
| 90 | } | ||
| 91 | |||
| 92 | use strict; | ||
| 93 | -use Test::More tests => 52; | ||
| 94 | +use Test::More tests => 47; | ||
| 95 | use MakeMaker::Test::Utils; | ||
| 96 | use MakeMaker::Test::Setup::BFD; | ||
| 97 | use ExtUtils::MakeMaker; | ||
| 98 | @@ -62,16 +62,16 @@ like( $stdout->read, qr{ | ||
| 99 | (?:Writing\ MYMETA.yml\ and\ MYMETA.json\n)? | ||
| 100 | }x ); | ||
| 101 | |||
| 102 | -is( $mm->{PREFIX}, '$(SITEPREFIX)', 'PREFIX set based on INSTALLDIRS' ); | ||
| 103 | +#is( $mm->{PREFIX}, '$(SITEPREFIX)', 'PREFIX set based on INSTALLDIRS' ); | ||
| 104 | |||
| 105 | isa_ok( $mm, 'ExtUtils::MakeMaker' ); | ||
| 106 | |||
| 107 | is( $mm->{NAME}, 'Big::Dummy', 'NAME' ); | ||
| 108 | is( $mm->{VERSION}, 0.01, 'VERSION' ); | ||
| 109 | |||
| 110 | -foreach my $prefix (qw(PREFIX PERLPREFIX SITEPREFIX VENDORPREFIX)) { | ||
| 111 | - unlike( $mm->{$prefix}, qr/\$\(PREFIX\)/ ); | ||
| 112 | -} | ||
| 113 | +#foreach my $prefix (qw(PREFIX PERLPREFIX SITEPREFIX VENDORPREFIX)) { | ||
| 114 | +# unlike( $mm->{$prefix}, qr/\$\(PREFIX\)/ ); | ||
| 115 | +#} | ||
| 116 | |||
| 117 | |||
| 118 | my $PREFIX = File::Spec->catdir('foo', 'bar'); | ||
diff --git a/meta/recipes-devtools/perl/perl-5.20.0/debian/prune_libs.diff b/meta/recipes-devtools/perl/perl-5.20.0/debian/prune_libs.diff deleted file mode 100644 index 50bcc47ccd..0000000000 --- a/meta/recipes-devtools/perl/perl-5.20.0/debian/prune_libs.diff +++ /dev/null | |||
| @@ -1,38 +0,0 @@ | |||
| 1 | From f2d2ddd656999f51148c66a3efce76bda8d2f9ca Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Brendan O'Dea <bod@debian.org> | ||
| 3 | Date: Fri, 18 Mar 2005 22:22:25 +1100 | ||
| 4 | Subject: Prune the list of libraries wanted to what we actually need. | ||
| 5 | |||
| 6 | Bug-Debian: http://bugs.debian.org/128355 | ||
| 7 | |||
| 8 | We want to keep the dependencies on perl-base as small as possible, | ||
| 9 | and some of the original list may be present on buildds (see Bug#128355). | ||
| 10 | |||
| 11 | Patch-Name: debian/prune_libs.diff | ||
| 12 | --- | ||
| 13 | Configure | 5 ++--- | ||
| 14 | 1 file changed, 2 insertions(+), 3 deletions(-) | ||
| 15 | |||
| 16 | diff --git a/Configure b/Configure | ||
| 17 | index 293ef61..3f80a76 100755 | ||
| 18 | --- a/Configure | ||
| 19 | +++ b/Configure | ||
| 20 | @@ -1387,8 +1387,7 @@ libswanted_uselargefiles='' | ||
| 21 | : set usesocks on the Configure command line to enable socks. | ||
| 22 | : List of libraries we want. | ||
| 23 | : If anyone needs extra -lxxx, put those in a hint file. | ||
| 24 | -libswanted="socket bind inet nsl nm ndbm gdbm dbm db malloc dl ld sun" | ||
| 25 | -libswanted="$libswanted m crypt sec util c cposix posix ucb bsd BSD" | ||
| 26 | +libswanted='gdbm gdbm_compat db dl m c crypt' | ||
| 27 | : We probably want to search /usr/shlib before most other libraries. | ||
| 28 | : This is only used by the lib/ExtUtils/MakeMaker.pm routine extliblist. | ||
| 29 | glibpth=`echo " $glibpth " | sed -e 's! /usr/shlib ! !'` | ||
| 30 | @@ -22796,7 +22795,7 @@ sunos*X4*) | ||
| 31 | ;; | ||
| 32 | *) case "$usedl" in | ||
| 33 | $define|true|[yY]*) | ||
| 34 | - set X `echo " $libs " | sed -e 's@ -lndbm @ @' -e 's@ -lgdbm @ @' -e 's@ -lgdbm_compat @ @' -e 's@ -ldbm @ @' -e 's@ -ldb @ @'` | ||
| 35 | + set X `echo " $libs " | sed -e 's@ -lgdbm @ @' -e 's@ -lgdbm_compat @ @' -e 's@ -ldb @ @'` | ||
| 36 | shift | ||
| 37 | perllibs="$*" | ||
| 38 | ;; | ||
diff --git a/meta/recipes-devtools/perl/perl-5.20.0/debian/regen-skip.diff b/meta/recipes-devtools/perl/perl-5.20.0/debian/regen-skip.diff deleted file mode 100644 index 50bc97c94b..0000000000 --- a/meta/recipes-devtools/perl/perl-5.20.0/debian/regen-skip.diff +++ /dev/null | |||
| @@ -1,27 +0,0 @@ | |||
| 1 | From 55a3d4b004595a9f171d79329c9d218f0b850bd8 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Niko Tyni <ntyni@debian.org> | ||
| 3 | Date: Sat, 17 May 2014 14:57:01 +0300 | ||
| 4 | Subject: Skip a regeneration check in unrelated git repositories | ||
| 5 | |||
| 6 | If the test is run in a git repository without lib/.gitignore, | ||
| 7 | for instance because the repository only imported the Perl tarball, | ||
| 8 | the regeneration check is broken because lib/.gitignore is missing. | ||
| 9 | |||
| 10 | Patch-Name: debian/regen-skip.diff | ||
| 11 | --- | ||
| 12 | regen/lib_cleanup.pl | 2 +- | ||
| 13 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 14 | |||
| 15 | diff --git a/regen/lib_cleanup.pl b/regen/lib_cleanup.pl | ||
| 16 | index c9d6e43..fece1ed 100644 | ||
| 17 | --- a/regen/lib_cleanup.pl | ||
| 18 | +++ b/regen/lib_cleanup.pl | ||
| 19 | @@ -159,7 +159,7 @@ foreach ('win32/Makefile', 'win32/makefile.mk') { | ||
| 20 | } | ||
| 21 | |||
| 22 | # This must come last as it can exit early: | ||
| 23 | -if ($TAP && !-d '.git' && !-f 'lib/.gitignore') { | ||
| 24 | +if ($TAP && !-d '.git' || !-f 'lib/.gitignore') { | ||
| 25 | print "ok # skip not being run from a git checkout, hence no lib/.gitignore\n"; | ||
| 26 | exit 0; | ||
| 27 | } | ||
diff --git a/meta/recipes-devtools/perl/perl-5.20.0/debian/skip-kfreebsd-crash.diff b/meta/recipes-devtools/perl/perl-5.20.0/debian/skip-kfreebsd-crash.diff deleted file mode 100644 index f7cc55570b..0000000000 --- a/meta/recipes-devtools/perl/perl-5.20.0/debian/skip-kfreebsd-crash.diff +++ /dev/null | |||
| @@ -1,40 +0,0 @@ | |||
| 1 | From 21747cdd5381a9466fc75ead783980ced8b184a3 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Niko Tyni <ntyni@debian.org> | ||
| 3 | Date: Fri, 5 Aug 2011 10:50:18 +0300 | ||
| 4 | Subject: Skip a crashing test case in t/op/threads.t on GNU/kFreeBSD | ||
| 5 | |||
| 6 | Bug: http://rt.perl.org/rt3/Ticket/Display.html?id=96272 | ||
| 7 | Bug-Debian: http://bugs.debian.org/628493 | ||
| 8 | |||
| 9 | The crash is not a regression in 5.14, it just gets triggered there by | ||
| 10 | a new unrelated test case. | ||
| 11 | |||
| 12 | Skip the test until the culprit is found. | ||
| 13 | |||
| 14 | Patch-Name: debian/skip-kfreebsd-crash.diff | ||
| 15 | --- | ||
| 16 | t/op/threads.t | 4 ++++ | ||
| 17 | 1 file changed, 4 insertions(+) | ||
| 18 | |||
| 19 | diff --git a/t/op/threads.t b/t/op/threads.t | ||
| 20 | index 6fb2410..67b5f4a 100644 | ||
| 21 | --- a/t/op/threads.t | ||
| 22 | +++ b/t/op/threads.t | ||
| 23 | @@ -376,6 +376,9 @@ EOF | ||
| 24 | } | ||
| 25 | |||
| 26 | |||
| 27 | +SKIP: { | ||
| 28 | + skip "[perl #96272] avoid crash on GNU/kFreeBSD", 1 | ||
| 29 | + if $^O eq 'gnukfreebsd'; | ||
| 30 | # [perl #78494] Pipes shared between threads block when closed | ||
| 31 | { | ||
| 32 | my $perl = which_perl; | ||
| 33 | @@ -384,6 +387,7 @@ EOF | ||
| 34 | threads->create(sub { })->join; | ||
| 35 | ok(1, "Pipes shared between threads do not block when closed"); | ||
| 36 | } | ||
| 37 | +} | ||
| 38 | |||
| 39 | # [perl #105208] Typeglob clones should not be cloned again during a join | ||
| 40 | { | ||
diff --git a/meta/recipes-devtools/perl/perl-5.20.0/debian/skip-upstream-git-tests.diff b/meta/recipes-devtools/perl/perl-5.20.0/debian/skip-upstream-git-tests.diff deleted file mode 100644 index 7110298f04..0000000000 --- a/meta/recipes-devtools/perl/perl-5.20.0/debian/skip-upstream-git-tests.diff +++ /dev/null | |||
| @@ -1,28 +0,0 @@ | |||
| 1 | From 4d1b20bcec1610d22b718ffae154427a7a218632 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Niko Tyni <ntyni@debian.org> | ||
| 3 | Date: Fri, 22 Apr 2011 11:15:32 +0300 | ||
| 4 | Subject: Skip tests specific to the upstream Git repository | ||
| 5 | |||
| 6 | These tests fail if run from a different git repository than | ||
| 7 | upstream. This complicates things needlessly for downstream packagers. | ||
| 8 | |||
| 9 | Skip the tests altogether even if the .git directory exists. | ||
| 10 | |||
| 11 | Patch-Name: debian/skip-upstream-git-tests.diff | ||
| 12 | --- | ||
| 13 | t/test.pl | 2 +- | ||
| 14 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 15 | |||
| 16 | diff --git a/t/test.pl b/t/test.pl | ||
| 17 | index 30db88c..0fdc4f4 100644 | ||
| 18 | --- a/t/test.pl | ||
| 19 | +++ b/t/test.pl | ||
| 20 | @@ -159,7 +159,7 @@ sub skip_all_without_config { | ||
| 21 | |||
| 22 | sub find_git_or_skip { | ||
| 23 | my ($source_dir, $reason); | ||
| 24 | - if (-d '.git') { | ||
| 25 | + if (-d '.git' && ! -d 'debian') { | ||
| 26 | $source_dir = '.'; | ||
| 27 | } elsif (-l 'MANIFEST' && -l 'AUTHORS') { | ||
| 28 | my $where = readlink 'MANIFEST'; | ||
diff --git a/meta/recipes-devtools/perl/perl-5.20.0/debian/squelch-locale-warnings.diff b/meta/recipes-devtools/perl/perl-5.20.0/debian/squelch-locale-warnings.diff deleted file mode 100644 index 5c1900498b..0000000000 --- a/meta/recipes-devtools/perl/perl-5.20.0/debian/squelch-locale-warnings.diff +++ /dev/null | |||
| @@ -1,55 +0,0 @@ | |||
| 1 | From 2f332eeedbf63f72f6b1b157a912282a31a25d3b Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Niko Tyni <ntyni@debian.org> | ||
| 3 | Date: Sun, 3 Oct 2010 21:36:17 +0300 | ||
| 4 | Subject: Squelch locale warnings in Debian package maintainer scripts | ||
| 5 | |||
| 6 | Bug-Debian: http://bugs.debian.org/508764 | ||
| 7 | |||
| 8 | The system locales are rather frequently out of sync with the C library | ||
| 9 | during package upgrades, causing a huge amount of useless Perl locale | ||
| 10 | warnings. Squelch them when running package maintainer scripts, detected | ||
| 11 | by the DPKG_RUNNING_VERSION environment variable. | ||
| 12 | |||
| 13 | Any real locale problem will show up after the system upgrade too, and | ||
| 14 | the warning will be triggered normally again at that point. | ||
| 15 | |||
| 16 | Patch-Name: debian/squelch-locale-warnings.diff | ||
| 17 | --- | ||
| 18 | locale.c | 4 ++++ | ||
| 19 | pod/perllocale.pod | 8 ++++++++ | ||
| 20 | 2 files changed, 12 insertions(+) | ||
| 21 | |||
| 22 | diff --git a/locale.c b/locale.c | ||
| 23 | index 6e8728c..f55c4b2 100644 | ||
| 24 | --- a/locale.c | ||
| 25 | +++ b/locale.c | ||
| 26 | @@ -512,6 +512,10 @@ Perl_init_i18nl10n(pTHX_ int printwarn) | ||
| 27 | char *p; | ||
| 28 | const bool locwarn = (printwarn > 1 || | ||
| 29 | (printwarn && | ||
| 30 | + | ||
| 31 | + /* Debian specific change - see http://bugs.debian.org/508764 */ | ||
| 32 | + (!PerlEnv_getenv("DPKG_RUNNING_VERSION")) && | ||
| 33 | + | ||
| 34 | (!(p = PerlEnv_getenv("PERL_BADLANG")) || atoi(p)))); | ||
| 35 | bool done = FALSE; | ||
| 36 | const char *system_default_locale = NULL; | ||
| 37 | diff --git a/pod/perllocale.pod b/pod/perllocale.pod | ||
| 38 | index 914281f..15de0d4 100644 | ||
| 39 | --- a/pod/perllocale.pod | ||
| 40 | +++ b/pod/perllocale.pod | ||
| 41 | @@ -1151,6 +1151,14 @@ B<NOTE>: PERL_BADLANG only gives you a way to hide the warning message. | ||
| 42 | The message tells about some problem in your system's locale support, | ||
| 43 | and you should investigate what the problem is. | ||
| 44 | |||
| 45 | +=item DPKG_RUNNING_VERSION | ||
| 46 | + | ||
| 47 | +On Debian systems, if the DPKG_RUNNING_VERSION environment variable is | ||
| 48 | +set (to any value), the locale failure warnings will be suppressed just | ||
| 49 | +like with a zero PERL_BADLANG setting. This is done to avoid floods | ||
| 50 | +of spurious warnings during system upgrades. | ||
| 51 | +See L<http://bugs.debian.org/508764>. | ||
| 52 | + | ||
| 53 | =back | ||
| 54 | |||
| 55 | The following environment variables are not specific to Perl: They are | ||
diff --git a/meta/recipes-devtools/perl/perl-5.20.0/debian/writable_site_dirs.diff b/meta/recipes-devtools/perl/perl-5.20.0/debian/writable_site_dirs.diff deleted file mode 100644 index f73f8bbabe..0000000000 --- a/meta/recipes-devtools/perl/perl-5.20.0/debian/writable_site_dirs.diff +++ /dev/null | |||
| @@ -1,36 +0,0 @@ | |||
| 1 | From f33f120f0fdf7cd100066390fe0bc426d45b1929 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Brendan O'Dea <bod@debian.org> | ||
| 3 | Date: Tue, 8 Mar 2005 19:30:38 +1100 | ||
| 4 | Subject: Set umask approproately for site install directories | ||
| 5 | |||
| 6 | Policy requires group writable site directories | ||
| 7 | |||
| 8 | Patch-Name: debian/writable_site_dirs.diff | ||
| 9 | --- | ||
| 10 | cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm | 6 +++--- | ||
| 11 | 1 file changed, 3 insertions(+), 3 deletions(-) | ||
| 12 | |||
| 13 | diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm | ||
| 14 | index 8fdb67c..8b86a24 100644 | ||
| 15 | --- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm | ||
| 16 | +++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm | ||
| 17 | @@ -2095,7 +2095,7 @@ q{ $(INST_LIB) $(DESTINSTALLPRIVLIB) \ | ||
| 18 | |||
| 19 | |||
| 20 | pure_site_install :: all | ||
| 21 | - $(NOECHO) umask 022; $(MOD_INSTALL) \ | ||
| 22 | + $(NOECHO) umask 02; $(MOD_INSTALL) \ | ||
| 23 | }; | ||
| 24 | push @m, | ||
| 25 | q{ read }.$self->catfile('$(SITEARCHEXP)','auto','$(FULLEXT)','.packlist').q{ \ | ||
| 26 | @@ -2156,8 +2156,8 @@ doc_perl_install :: all | ||
| 27 | |||
| 28 | doc_site_install :: all | ||
| 29 | $(NOECHO) $(ECHO) Appending installation info to $(DESTINSTALLARCHLIB)/perllocal.pod | ||
| 30 | - -$(NOECHO) umask 022; $(MKPATH) $(DESTINSTALLARCHLIB) | ||
| 31 | - -$(NOECHO) umask 022; $(DOC_INSTALL) \ | ||
| 32 | + -$(NOECHO) umask 02; $(MKPATH) $(DESTINSTALLARCHLIB) | ||
| 33 | + -$(NOECHO) umask 02; $(DOC_INSTALL) \ | ||
| 34 | "Module" "$(NAME)" \ | ||
| 35 | "installed into" "$(INSTALLSITELIB)" \ | ||
| 36 | LINKTYPE "$(LINKTYPE)" \ | ||
diff --git a/meta/recipes-devtools/perl/perl-5.20.0/dynaloaderhack.patch b/meta/recipes-devtools/perl/perl-5.20.0/dynaloaderhack.patch deleted file mode 100644 index 3df593346c..0000000000 --- a/meta/recipes-devtools/perl/perl-5.20.0/dynaloaderhack.patch +++ /dev/null | |||
| @@ -1,23 +0,0 @@ | |||
| 1 | Hack the dynamic module loader so that we use native modules since we can't load | ||
| 2 | the target ones. | ||
| 3 | |||
| 4 | Upstream-Status: Inappropriate | ||
| 5 | |||
| 6 | RP | ||
| 7 | 2013/01/13 | ||
| 8 | |||
| 9 | Index: perl-5.14.2/ext/DynaLoader/DynaLoader_pm.PL | ||
| 10 | =================================================================== | ||
| 11 | --- perl-5.14.2.orig/ext/DynaLoader/DynaLoader_pm.PL 2011-09-19 13:18:22.000000000 +0000 | ||
| 12 | +++ perl-5.14.2/ext/DynaLoader/DynaLoader_pm.PL 2013-01-19 16:09:51.020584945 +0000 | ||
| 13 | @@ -310,6 +310,10 @@ | ||
| 14 | foreach (@INC) { | ||
| 15 | <<$^O-eq-VMS>>chop($_ = VMS::Filespec::unixpath($_));<</$^O-eq-VMS>> | ||
| 16 | my $dir = "$_/auto/$modpname"; | ||
| 17 | + | ||
| 18 | + if (defined $ENV{PERL_LIB} and defined $ENV{PERLHOSTLIB}) { | ||
| 19 | + $dir =~ s/$ENV{PERL_LIB}/$ENV{PERLHOSTLIB}/g; | ||
| 20 | + } | ||
| 21 | |||
| 22 | next unless -d $dir; # skip over uninteresting directories | ||
| 23 | |||
diff --git a/meta/recipes-devtools/perl/perl-5.20.0/fix-FF_MORE-crash.patch b/meta/recipes-devtools/perl/perl-5.20.0/fix-FF_MORE-crash.patch deleted file mode 100644 index 9ec041c833..0000000000 --- a/meta/recipes-devtools/perl/perl-5.20.0/fix-FF_MORE-crash.patch +++ /dev/null | |||
| @@ -1,21 +0,0 @@ | |||
| 1 | Upstream-Status: Backport | ||
| 2 | Reference: https://rt.perl.org/Public/Bug/Display.html?id=123591 | ||
| 3 | From 62db6ea5fed19611596cbc5fc0b8a4df2c604e58 Mon Sep 17 00:00:00 2001 | ||
| 4 | From: Tony Cook <tony@develop-help.com> | ||
| 5 | Date: Mon, 19 Jan 2015 16:03:18 +1100 | ||
| 6 | Subject: [PATCH 1/1] [perl #123538] always set chophere and itembytes at the same time | ||
| 7 | |||
| 8 | Previously this would crash in FF_MORE because chophere was still NULL. | ||
| 9 | |||
| 10 | Signed-off-by: Gary Thomas <gary@mlbassoc.com> | ||
| 11 | Index: perl-5.20.0/pp_ctl.c | ||
| 12 | =================================================================== | ||
| 13 | --- perl-5.20.0.orig/pp_ctl.c | ||
| 14 | +++ perl-5.20.0/pp_ctl.c | ||
| 15 | @@ -590,6 +590,7 @@ PP(pp_formline) | ||
| 16 | break; | ||
| 17 | } | ||
| 18 | itembytes = s - item; | ||
| 19 | + chophere = s; | ||
| 20 | break; | ||
| 21 | } | ||
diff --git a/meta/recipes-devtools/perl/perl-5.20.0/fix_bad_rpath.patch b/meta/recipes-devtools/perl/perl-5.20.0/fix_bad_rpath.patch deleted file mode 100644 index 69ac434779..0000000000 --- a/meta/recipes-devtools/perl/perl-5.20.0/fix_bad_rpath.patch +++ /dev/null | |||
| @@ -1,24 +0,0 @@ | |||
| 1 | Upstream-Status:Inappropriate [embedded specific] | ||
| 2 | Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com> | ||
| 3 | 2011/07/01 | ||
| 4 | |||
| 5 | Fix these Package QA warnings before they are converted into fetal errors: | ||
| 6 | |||
| 7 | WARNING: QA Issue: package perl-module-compress contains bad RPATH /build_disk/poky_build/build0/tmp/sysroots/qemux86/usr/lib in file /build_disk/poky_build/build0/tmp/work/i586-poky-linux/perl-5.12.3-r1/packages-split/perl-module-compress/usr/lib/perl/5.12.3/auto/Compress/Raw/Zlib/Zlib.so | ||
| 8 | |||
| 9 | This fixes this warning for perl recipe as well as libxml-parser-perl recipe. | ||
| 10 | It is a fix to MakeMaker within perl, so all such perl recipes will get | ||
| 11 | fixed with this perl fix. | ||
| 12 | |||
| 13 | Index: perl-5.14.2/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm | ||
| 14 | =================================================================== | ||
| 15 | --- perl-5.14.2.orig/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm | ||
| 16 | +++ perl-5.14.2/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm | ||
| 17 | @@ -55,6 +55,7 @@ sub _unix_os2_ext { | ||
| 18 | my($found) = 0; | ||
| 19 | |||
| 20 | # Debian-specific: don't use LD_RUN_PATH for standard dirs | ||
| 21 | + push(@libpath, "SYSROOTLIB"); | ||
| 22 | $ld_run_path_seen{$_}++ for @libpath; | ||
| 23 | |||
| 24 | foreach my $thislib (split ' ', $potential_libs) { | ||
diff --git a/meta/recipes-devtools/perl/perl-5.20.0/generate-sh.patch b/meta/recipes-devtools/perl/perl-5.20.0/generate-sh.patch deleted file mode 100644 index 27f6e691c0..0000000000 --- a/meta/recipes-devtools/perl/perl-5.20.0/generate-sh.patch +++ /dev/null | |||
| @@ -1,56 +0,0 @@ | |||
| 1 | Upstream-Status:Inappropriate [embedded specific] | ||
| 2 | |||
| 3 | Use the ld flags from the supplied configuration file. For sh we need the | ||
| 4 | flags that specify to build PIC code so that the shared libraries work. | ||
| 5 | |||
| 6 | Index: perl-5.14.2/Cross/generate_config_sh | ||
| 7 | =================================================================== | ||
| 8 | --- perl-5.14.2.orig/Cross/generate_config_sh 2010-12-30 04:07:14.000000000 +0200 | ||
| 9 | +++ perl-5.14.2/Cross/generate_config_sh 2012-11-22 15:58:49.852852805 +0200 | ||
| 10 | @@ -19,10 +19,10 @@ | ||
| 11 | $callbacks->{'ar'} = [\&simple_process, ["AR", "arm-linux-ar"]]; | ||
| 12 | $callbacks->{'archname'} = [\&simple_process, ["SYS", "armv4l-linux"]]; | ||
| 13 | $callbacks->{'cc'} = [\&simple_process, ["CC", "arm-linux-gcc"]]; | ||
| 14 | -$callbacks->{'cccdlflags'} = [\&simple_process, ["CFLAGS", ""]]; | ||
| 15 | -$callbacks->{'ccdlflags'} = [\&simple_process, ["CFLAGS", ""]]; | ||
| 16 | -$callbacks->{'ccflags'} = [\&simple_process, ["CFLAGS", "-fno-strict-aliasing -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"]]; | ||
| 17 | -$callbacks->{'ccflags_uselargefiles'} = [\&simple_process, ["CFLAGS", "-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"]]; | ||
| 18 | +#$callbacks->{'cccdlflags'} = [\&simple_process, ["CFLAGS", ""]]; | ||
| 19 | +#$callbacks->{'ccdlflags'} = [\&simple_process, ["CFLAGS", ""]]; | ||
| 20 | +$callbacks->{'ccflags'} = [\&simple_process_insert, ["CFLAGS", "-fno-strict-aliasing -D_GNU_SOURCE -DTHREADS_HAVE_PIDS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"]]; | ||
| 21 | +$callbacks->{'ccflags_uselargefiles'} = [\&simple_process_insert, ["CFLAGS", "-D_GNU_SOURCE -DTHREADS_HAVE_PIDS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"]]; | ||
| 22 | $callbacks->{'ccname'} = [\&simple_process, ["CC", "arm-linux-gcc"]]; | ||
| 23 | $callbacks->{'cpp'} = [\&simple_process, ["CCP", "arm-linux-cpp"]]; | ||
| 24 | $callbacks->{'cppflags'} = [\&simple_process, ["CCPFLAGS", "-fno-strict-aliasing"]]; | ||
| 25 | @@ -30,6 +30,7 @@ | ||
| 26 | $callbacks->{'cppstdin'} = [\&simple_process_append, ["CC", "arm-linux-gcc -E", "-E"]]; | ||
| 27 | $callbacks->{'full_ar'} = [\&backtick, ["AR", "which $ENV{AR}", "/usr/local/arm/2.95.3/bin/arm-linux-ar"]]; | ||
| 28 | $callbacks->{'ld'} = [\&simple_process, ["LD", "arm-linux-ld"]]; | ||
| 29 | +$callbacks->{'lddlflags'} = [\&simple_process, ["LDDLFLAGS", ""]]; | ||
| 30 | $callbacks->{'ldflags'} = [\&simple_process, ["LDFLAGS", ""]]; | ||
| 31 | $callbacks->{'ldflags_uselargefiles'} = [\&simple_process, ["LDFLAGS", ""]]; | ||
| 32 | $callbacks->{'myarchname'} = [\&simple_process, ["SYS", "armv4l-linux"]]; | ||
| 33 | @@ -105,6 +106,23 @@ | ||
| 34 | |||
| 35 | } | ||
| 36 | |||
| 37 | +# Insert env var into the variables value | ||
| 38 | +sub simple_process_insert { | ||
| 39 | + my $key = shift; | ||
| 40 | + my $value = shift; | ||
| 41 | + my $envvar = $callbacks->{$key}->[1][0]; | ||
| 42 | + | ||
| 43 | + if ($ENV{$envvar}) { | ||
| 44 | + # Strip quotes from value | ||
| 45 | + $value =~ s/^\'//; | ||
| 46 | + $value =~ s/\'$//; | ||
| 47 | + # Remove -I/usr/local/... from the value | ||
| 48 | + $value =~ s#\W-I/usr/local/\w+\W# #g; | ||
| 49 | + # Prepend env var (OE setting) to value | ||
| 50 | + print("$key=\'$ENV{$envvar} $value\'\n"); | ||
| 51 | + } | ||
| 52 | +} | ||
| 53 | + | ||
| 54 | sub library_munge { | ||
| 55 | my $key = shift; | ||
| 56 | my $value = shift; | ||
diff --git a/meta/recipes-devtools/perl/perl-5.20.0/installperl.patch b/meta/recipes-devtools/perl/perl-5.20.0/installperl.patch deleted file mode 100644 index 456012376e..0000000000 --- a/meta/recipes-devtools/perl/perl-5.20.0/installperl.patch +++ /dev/null | |||
| @@ -1,17 +0,0 @@ | |||
| 1 | Upstream-Status:Inappropriate [embedded specific] | ||
| 2 | |||
| 3 | Index: perl-5.12.3/installperl | ||
| 4 | =================================================================== | ||
| 5 | --- perl-5.12.3.orig/installperl | ||
| 6 | +++ perl-5.12.3/installperl | ||
| 7 | @@ -3,8 +3,8 @@ | ||
| 8 | BEGIN { | ||
| 9 | require 5.004; | ||
| 10 | chdir '..' if !-d 'lib' and -d '../lib'; | ||
| 11 | - @INC = 'lib'; | ||
| 12 | - $ENV{PERL5LIB} = 'lib'; | ||
| 13 | +# @INC = 'lib'; | ||
| 14 | +# $ENV{PERL5LIB} = 'lib'; | ||
| 15 | |||
| 16 | # This needs to be at BEGIN time, before any use of Config | ||
| 17 | require './install_lib.pl'; | ||
diff --git a/meta/recipes-devtools/perl/perl-5.20.0/letgcc-find-errno.patch b/meta/recipes-devtools/perl/perl-5.20.0/letgcc-find-errno.patch deleted file mode 100644 index 5161e4c8b6..0000000000 --- a/meta/recipes-devtools/perl/perl-5.20.0/letgcc-find-errno.patch +++ /dev/null | |||
| @@ -1,46 +0,0 @@ | |||
| 1 | Upstream-Status:Inappropriate [embedded specific] | ||
| 2 | |||
| 3 | This removes all the logic that perl uses to locate an appropriate | ||
| 4 | errno.h for the target. Instead we simple create a file that does | ||
| 5 | |||
| 6 | #include "errno.h" | ||
| 7 | |||
| 8 | and use that as the file to parse. This is needed when using an | ||
| 9 | external toolchain since perl will search in ${STAGING_INCDIR} for | ||
| 10 | errno.h (when using gcc) and that isn't where it's located - its | ||
| 11 | wherever the external toolchain keeps it's headers. | ||
| 12 | |||
| 13 | Index: perl-5.12.3/ext/Errno/Errno_pm.PL | ||
| 14 | =================================================================== | ||
| 15 | --- perl-5.12.3.orig/ext/Errno/Errno_pm.PL | ||
| 16 | +++ perl-5.12.3/ext/Errno/Errno_pm.PL | ||
| 17 | @@ -17,8 +17,18 @@ unlink "Errno.tmp" if -f "Errno.tmp"; | ||
| 18 | open OUT, ">Errno.tmp" or die "Cannot open Errno.tmp: $!"; | ||
| 19 | select OUT; | ||
| 20 | my $file; | ||
| 21 | -my @files = get_files(); | ||
| 22 | -if ($Config{gccversion} ne '' && $^O eq 'MSWin32') { | ||
| 23 | +#my @files = get_files(); | ||
| 24 | +my @files = ("errno.h"); | ||
| 25 | + | ||
| 26 | +if (1) { | ||
| 27 | + open INCS, '>includes.c' or | ||
| 28 | + die "Cannot open includes.c"; | ||
| 29 | + print INCS qq[#include "errno.h"\n]; | ||
| 30 | + close INCS; | ||
| 31 | + process_file('includes.c'); | ||
| 32 | + unlink 'includes.c'; | ||
| 33 | +} | ||
| 34 | +elsif ($Config{gccversion} ne '' && $^O eq 'MSWin32') { | ||
| 35 | # MinGW complains "warning: #pragma system_header ignored outside include | ||
| 36 | # file" if the header files are processed individually, so include them | ||
| 37 | # all in .c file and process that instead. | ||
| 38 | @@ -53,7 +63,7 @@ sub process_file { | ||
| 39 | chomp($file = `cygpath -w "$file"`); | ||
| 40 | } | ||
| 41 | |||
| 42 | - return unless defined $file and -f $file; | ||
| 43 | +# return unless defined $file and -f $file; | ||
| 44 | # warn "Processing $file\n"; | ||
| 45 | |||
| 46 | local *FH; | ||
diff --git a/meta/recipes-devtools/perl/perl-5.20.0/make_ext.pl-fix-regenerate-makefile-failed-while-cc-.patch b/meta/recipes-devtools/perl/perl-5.20.0/make_ext.pl-fix-regenerate-makefile-failed-while-cc-.patch deleted file mode 100644 index de6f65294c..0000000000 --- a/meta/recipes-devtools/perl/perl-5.20.0/make_ext.pl-fix-regenerate-makefile-failed-while-cc-.patch +++ /dev/null | |||
| @@ -1,30 +0,0 @@ | |||
| 1 | make_ext.pl: fix regenerate makefile failed while $cc changed | ||
| 2 | |||
| 3 | While $cc changed, the existance of 'xdefine' caused makefile | ||
| 4 | regeneration failed. | ||
| 5 | |||
| 6 | Upstream-Status: Pending | ||
| 7 | |||
| 8 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | ||
| 9 | --- | ||
| 10 | make_ext.pl | 4 ++++ | ||
| 11 | 1 file changed, 4 insertions(+) | ||
| 12 | |||
| 13 | diff --git a/make_ext.pl b/make_ext.pl | ||
| 14 | index b433762..9fc1a36 100644 | ||
| 15 | --- a/make_ext.pl | ||
| 16 | +++ b/make_ext.pl | ||
| 17 | @@ -335,6 +335,10 @@ sub build_extension { | ||
| 18 | print "Deleting non-Cross makefile\n"; | ||
| 19 | close $mfh or die "close $makefile: $!"; | ||
| 20 | _unlink($makefile); | ||
| 21 | + if(-e 'xdefine') { | ||
| 22 | + print "Deleting xdefine for regenerate makefile\n"; | ||
| 23 | + _unlink('xdefine'); | ||
| 24 | + } | ||
| 25 | } | ||
| 26 | } | ||
| 27 | } | ||
| 28 | -- | ||
| 29 | 1.8.1.2 | ||
| 30 | |||
diff --git a/meta/recipes-devtools/perl/perl-5.20.0/native-nopacklist.patch b/meta/recipes-devtools/perl/perl-5.20.0/native-nopacklist.patch deleted file mode 100644 index aafe0e24db..0000000000 --- a/meta/recipes-devtools/perl/perl-5.20.0/native-nopacklist.patch +++ /dev/null | |||
| @@ -1,94 +0,0 @@ | |||
| 1 | Upstream-Status:Inappropriate [debian patch] | ||
| 2 | |||
| 3 | Part of 52_debian_extutils_hacks.patch just to exclude the installation of .packlist files | ||
| 4 | |||
| 5 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | ||
| 6 | --- | ||
| 7 | cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm | 36 +++---------------------- | ||
| 8 | 1 file changed, 4 insertions(+), 32 deletions(-) | ||
| 9 | |||
| 10 | diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm | ||
| 11 | --- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm | ||
| 12 | +++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm | ||
| 13 | @@ -2079,11 +2079,6 @@ pure_perl_install :: all | ||
| 14 | }; | ||
| 15 | |||
| 16 | push @m, | ||
| 17 | -q{ read }.$self->catfile('$(PERL_ARCHLIB)','auto','$(FULLEXT)','.packlist').q{ \ | ||
| 18 | - write }.$self->catfile('$(DESTINSTALLARCHLIB)','auto','$(FULLEXT)','.packlist').q{ \ | ||
| 19 | -} unless $self->{NO_PACKLIST}; | ||
| 20 | - | ||
| 21 | - push @m, | ||
| 22 | q{ $(INST_LIB) $(DESTINSTALLPRIVLIB) \ | ||
| 23 | $(INST_ARCHLIB) $(DESTINSTALLARCHLIB) \ | ||
| 24 | $(INST_BIN) $(DESTINSTALLBIN) \ | ||
| 25 | @@ -2115,10 +2110,6 @@ q{ $(INST_LIB) $(DESTINSTALLSITELIB) \ | ||
| 26 | pure_vendor_install :: all | ||
| 27 | $(NOECHO) $(MOD_INSTALL) \ | ||
| 28 | }; | ||
| 29 | - push @m, | ||
| 30 | -q{ read }.$self->catfile('$(VENDORARCHEXP)','auto','$(FULLEXT)','.packlist').q{ \ | ||
| 31 | - write }.$self->catfile('$(DESTINSTALLVENDORARCH)','auto','$(FULLEXT)','.packlist').q{ \ | ||
| 32 | -} unless $self->{NO_PACKLIST}; | ||
| 33 | |||
| 34 | push @m, | ||
| 35 | q{ $(INST_LIB) $(DESTINSTALLVENDORLIB) \ | ||
| 36 | @@ -2144,37 +2135,19 @@ doc_vendor_install :: all | ||
| 37 | |||
| 38 | push @m, q{ | ||
| 39 | doc_perl_install :: all | ||
| 40 | - $(NOECHO) $(ECHO) Appending installation info to $(DESTINSTALLARCHLIB)/perllocal.pod | ||
| 41 | - -$(NOECHO) $(MKPATH) $(DESTINSTALLARCHLIB) | ||
| 42 | - -$(NOECHO) $(DOC_INSTALL) \ | ||
| 43 | - "Module" "$(NAME)" \ | ||
| 44 | - "installed into" "$(INSTALLPRIVLIB)" \ | ||
| 45 | - LINKTYPE "$(LINKTYPE)" \ | ||
| 46 | - VERSION "$(VERSION)" \ | ||
| 47 | - EXE_FILES "$(EXE_FILES)" \ | ||
| 48 | - >> }.$self->catfile('$(DESTINSTALLARCHLIB)','perllocal.pod').q{ | ||
| 49 | |||
| 50 | doc_site_install :: all | ||
| 51 | - $(NOECHO) $(ECHO) Appending installation info to $(DESTINSTALLARCHLIB)/perllocal.pod | ||
| 52 | - -$(NOECHO) $(MKPATH) $(DESTINSTALLARCHLIB) | ||
| 53 | + $(NOECHO) $(ECHO) Appending installation info to $(DESTINSTALLSITEARCH)/perllocal.pod | ||
| 54 | + -$(NOECHO) $(MKPATH) $(DESTINSTALLSITEARCH) | ||
| 55 | -$(NOECHO) $(DOC_INSTALL) \ | ||
| 56 | "Module" "$(NAME)" \ | ||
| 57 | "installed into" "$(INSTALLSITELIB)" \ | ||
| 58 | LINKTYPE "$(LINKTYPE)" \ | ||
| 59 | VERSION "$(VERSION)" \ | ||
| 60 | EXE_FILES "$(EXE_FILES)" \ | ||
| 61 | - >> }.$self->catfile('$(DESTINSTALLARCHLIB)','perllocal.pod').q{ | ||
| 62 | + >> }.$self->catfile('$(DESTINSTALLSITEARCH)','perllocal.pod').q{ | ||
| 63 | |||
| 64 | doc_vendor_install :: all | ||
| 65 | - $(NOECHO) $(ECHO) Appending installation info to $(DESTINSTALLARCHLIB)/perllocal.pod | ||
| 66 | - -$(NOECHO) $(MKPATH) $(DESTINSTALLARCHLIB) | ||
| 67 | - -$(NOECHO) $(DOC_INSTALL) \ | ||
| 68 | - "Module" "$(NAME)" \ | ||
| 69 | - "installed into" "$(INSTALLVENDORLIB)" \ | ||
| 70 | - LINKTYPE "$(LINKTYPE)" \ | ||
| 71 | - VERSION "$(VERSION)" \ | ||
| 72 | - EXE_FILES "$(EXE_FILES)" \ | ||
| 73 | - >> }.$self->catfile('$(DESTINSTALLARCHLIB)','perllocal.pod').q{ | ||
| 74 | |||
| 75 | } unless $self->{NO_PERLLOCAL}; | ||
| 76 | |||
| 77 | @@ -2183,13 +2156,12 @@ uninstall :: uninstall_from_$(INSTALLDIRS)dirs | ||
| 78 | $(NOECHO) $(NOOP) | ||
| 79 | |||
| 80 | uninstall_from_perldirs :: | ||
| 81 | - $(NOECHO) $(UNINSTALL) }.$self->catfile('$(PERL_ARCHLIB)','auto','$(FULLEXT)','.packlist').q{ | ||
| 82 | |||
| 83 | uninstall_from_sitedirs :: | ||
| 84 | $(NOECHO) $(UNINSTALL) }.$self->catfile('$(SITEARCHEXP)','auto','$(FULLEXT)','.packlist').q{ | ||
| 85 | |||
| 86 | uninstall_from_vendordirs :: | ||
| 87 | - $(NOECHO) $(UNINSTALL) }.$self->catfile('$(VENDORARCHEXP)','auto','$(FULLEXT)','.packlist').q{ | ||
| 88 | + | ||
| 89 | }; | ||
| 90 | |||
| 91 | join("",@m); | ||
| 92 | -- | ||
| 93 | 1.8.1.2 | ||
| 94 | |||
diff --git a/meta/recipes-devtools/perl/perl-5.20.0/native-perlinc.patch b/meta/recipes-devtools/perl/perl-5.20.0/native-perlinc.patch deleted file mode 100644 index f0bb1f6596..0000000000 --- a/meta/recipes-devtools/perl/perl-5.20.0/native-perlinc.patch +++ /dev/null | |||
| @@ -1,26 +0,0 @@ | |||
| 1 | Upstream-Status:Inappropriate [embedded specific] | ||
| 2 | |||
| 3 | Index: perl-5.8.8/lib/ExtUtils/MM_Unix.pm | ||
| 4 | =================================================================== | ||
| 5 | --- perl-5.12.3.orig/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm 2008-10-31 22:01:35.000000000 +0000 | ||
| 6 | +++ perl-5.12.3/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm 2008-10-31 22:01:35.000000000 +0000 | ||
| 7 | @@ -1597,6 +1597,19 @@ | ||
| 8 | $self->{PERL_LIB} ||= $Config{privlibexp}; | ||
| 9 | $self->{PERL_ARCHLIB} ||= $Config{archlibexp}; | ||
| 10 | $self->{PERL_INC} = $self->catdir("$self->{PERL_ARCHLIB}","CORE"); # wild guess for now | ||
| 11 | + # Check for environment override so we'll find the headers in the correct place | ||
| 12 | + if (defined $ENV{PERL_LIB}) | ||
| 13 | + { | ||
| 14 | + $self->{PERL_LIB} = $ENV{PERL_LIB}; | ||
| 15 | + } | ||
| 16 | + if (defined $ENV{PERL_ARCHLIB}) | ||
| 17 | + { | ||
| 18 | + $self->{PERL_ARCHLIB} = $ENV{PERL_ARCHLIB}; | ||
| 19 | + } | ||
| 20 | + if (defined $ENV{PERL_INC}) | ||
| 21 | + { | ||
| 22 | + $self->{PERL_INC} = $ENV{PERL_INC}; | ||
| 23 | + } | ||
| 24 | my $perl_h; | ||
| 25 | |||
| 26 | if (not -f ($perl_h = $self->catfile($self->{PERL_INC},"perl.h")) | ||
diff --git a/meta/recipes-devtools/perl/perl-5.20.0/perl-5.14.3-fix-CVE-2010-4777.patch b/meta/recipes-devtools/perl/perl-5.20.0/perl-5.14.3-fix-CVE-2010-4777.patch deleted file mode 100644 index e0dcf412bb..0000000000 --- a/meta/recipes-devtools/perl/perl-5.20.0/perl-5.14.3-fix-CVE-2010-4777.patch +++ /dev/null | |||
| @@ -1,45 +0,0 @@ | |||
| 1 | perl:fix for CVE-2010-4777 | ||
| 2 | |||
| 3 | Upstream-Status: Backport | ||
| 4 | |||
| 5 | The Perl_reg_numbered_buff_fetch function in Perl 5.10.0, 5.12.0, | ||
| 6 | 5.14.0, and other versions, when running with debugging enabled, | ||
| 7 | allows context-dependent attackers to cause a denial of service | ||
| 8 | (assertion failure and application exit) via crafted input that | ||
| 9 | is not properly handled when using certain regular expressions, | ||
| 10 | as demonstrated by causing SpamAssassin and OCSInventory to | ||
| 11 | crash. | ||
| 12 | |||
| 13 | http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2010-4777 | ||
| 14 | |||
| 15 | Signed-off-by: yanjun.zhu <yanjun.zhu@windriver.com> | ||
| 16 | --- a/regcomp.c | ||
| 17 | +++ b/regcomp.c | ||
| 18 | @@ -11868,8 +11868,25 @@ Perl_save_re_context(pTHX) | ||
| 19 | |||
| 20 | if (gvp) { | ||
| 21 | GV * const gv = *gvp; | ||
| 22 | - if (SvTYPE(gv) == SVt_PVGV && GvSV(gv)) | ||
| 23 | - save_scalar(gv); | ||
| 24 | + if (SvTYPE(gv) == SVt_PVGV && GvSV(gv)) { | ||
| 25 | + /* this is a copy of save_scalar() without the GETMAGIC call, RT#76538 */ | ||
| 26 | + SV ** const sptr = &GvSVn(gv); | ||
| 27 | + SV * osv = *sptr; | ||
| 28 | + SV * nsv = newSV(0); | ||
| 29 | + save_pushptrptr(SvREFCNT_inc_simple(gv), | ||
| 30 | + SvREFCNT_inc(osv), SAVEt_SV); | ||
| 31 | + if (SvTYPE(osv) >= SVt_PVMG && SvMAGIC(osv) && | ||
| 32 | + SvTYPE(osv) != SVt_PVGV) { | ||
| 33 | + if (SvGMAGICAL(osv)) { | ||
| 34 | + const bool oldtainted = PL_tainted; | ||
| 35 | + SvFLAGS(osv) |= (SvFLAGS(osv) & | ||
| 36 | + (SVp_IOK|SVp_NOK|SVp_POK)) >> PRIVSHIFT; | ||
| 37 | + PL_tainted = oldtainted; | ||
| 38 | + } | ||
| 39 | + mg_localize(osv, nsv, 1); | ||
| 40 | + } | ||
| 41 | + *sptr = nsv; | ||
| 42 | + } | ||
| 43 | } | ||
| 44 | } | ||
| 45 | } | ||
diff --git a/meta/recipes-devtools/perl/perl-5.20.0/perl-archlib-exp.patch b/meta/recipes-devtools/perl/perl-5.20.0/perl-archlib-exp.patch deleted file mode 100644 index d912d0031e..0000000000 --- a/meta/recipes-devtools/perl/perl-5.20.0/perl-archlib-exp.patch +++ /dev/null | |||
| @@ -1,40 +0,0 @@ | |||
| 1 | perl: add archlib_exp variable used to generate ARCHLIB_EXP in config.h | ||
| 2 | |||
| 3 | perl.c uses an ARCHLIB_EXP define to generate compile-time code that | ||
| 4 | adds the archlibexp path to @INC during run-time initialization of a | ||
| 5 | new perl interpreter. | ||
| 6 | |||
| 7 | Because we've changed this value in a temporary way to make it | ||
| 8 | possible to use ExtUtils::Embed in the target build (the temporary | ||
| 9 | value in config.sh gets re-stripped out during packaging), the | ||
| 10 | ARCHLIB_EXP value that gets generated still uses the temporary version | ||
| 11 | instead of the original expected version (i.e. becauses it's in the | ||
| 12 | generated config.h, it doesn't get stripped out during packaging like | ||
| 13 | the others in config.sh). | ||
| 14 | |||
| 15 | This creates an unmodified version called archlib_exp that gets used | ||
| 16 | by a modified config_h.SH to get the correct value into config.h | ||
| 17 | |||
| 18 | This patch uses an unmodified version of archlibexp called | ||
| 19 | archlib_exp, introduced to config.sh, which is used to generate the | ||
| 20 | correct value of ARCHLIB_EXP into config.h | ||
| 21 | |||
| 22 | See YOCTO #3099 for more info. | ||
| 23 | |||
| 24 | Upstream-Status:Inappropriate [embedded specific] | ||
| 25 | |||
| 26 | Signed-off-by: Tom Zanussi <tom.zanussi@intel.com> | ||
| 27 | |||
| 28 | Index: perl-5.14.2/config_h.SH | ||
| 29 | =================================================================== | ||
| 30 | --- perl-5.14.2.orig/config_h.SH | ||
| 31 | +++ perl-5.14.2/config_h.SH | ||
| 32 | @@ -996,7 +996,7 @@ sed <<!GROK!THIS! >$CONFIG_H -e 's!^#und | ||
| 33 | * in programs that are not prepared to deal with ~ expansion at run-time. | ||
| 34 | */ | ||
| 35 | #$d_archlib ARCHLIB "$archlib" /**/ | ||
| 36 | -#$d_archlib ARCHLIB_EXP "$archlibexp" /**/ | ||
| 37 | +#$d_archlib ARCHLIB_EXP "$archlib_exp" /**/ | ||
| 38 | |||
| 39 | /* ARCHNAME: | ||
| 40 | * This symbol holds a string representing the architecture name. | ||
diff --git a/meta/recipes-devtools/perl/perl-5.20.0/perl-configpm-switch.patch b/meta/recipes-devtools/perl/perl-5.20.0/perl-configpm-switch.patch deleted file mode 100644 index c6cc15c93f..0000000000 --- a/meta/recipes-devtools/perl/perl-5.20.0/perl-configpm-switch.patch +++ /dev/null | |||
| @@ -1,47 +0,0 @@ | |||
| 1 | Upstream-Status:Inappropriate [native] | ||
| 2 | |||
| 3 | This patch is used for perl-native only. It enables the switching of | ||
| 4 | configuration files between Config_heavy.pl and | ||
| 5 | Config_heavy-target.pl by setting the environment variables | ||
| 6 | PERLCONFIGTARGET - the later containing settings for the target while | ||
| 7 | the former contains those for the host. This will allow cpan.bbclass | ||
| 8 | to use the settings appropriate for the native and/or target builds | ||
| 9 | as required. This also disables the use of the cache since the cached | ||
| 10 | values would be valid for the host only. | ||
| 11 | |||
| 12 | Index: perl-5.14.2/configpm | ||
| 13 | =================================================================== | ||
| 14 | --- perl-5.14.2.orig/configpm | ||
| 15 | +++ perl-5.14.2/configpm | ||
| 16 | @@ -658,7 +658,7 @@ sub FETCH { | ||
| 17 | my($self, $key) = @_; | ||
| 18 | |||
| 19 | # check for cached value (which may be undef so we use exists not defined) | ||
| 20 | - return exists $self->{$key} ? $self->{$key} : $self->fetch_string($key); | ||
| 21 | + return $self->fetch_string($key); | ||
| 22 | } | ||
| 23 | |||
| 24 | ENDOFEND | ||
| 25 | @@ -816,7 +816,21 @@ $config_txt .= sprintf <<'ENDOFTIE', $fa | ||
| 26 | sub DESTROY { } | ||
| 27 | |||
| 28 | sub AUTOLOAD { | ||
| 29 | - require 'Config_heavy.pl'; | ||
| 30 | + my $cfgfile = 'Config_heavy.pl'; | ||
| 31 | + if (defined $ENV{PERLCONFIGTARGET} and $ENV{PERLCONFIGTARGET} eq "yes") | ||
| 32 | + { | ||
| 33 | + $cfgfile = 'Config_heavy-target.pl'; | ||
| 34 | + } | ||
| 35 | + if (defined $ENV{PERL_ARCHLIB}) | ||
| 36 | + { | ||
| 37 | + push @INC, $ENV{PERL_ARCHLIB}; | ||
| 38 | + require $cfgfile; | ||
| 39 | + pop @INC; | ||
| 40 | + } | ||
| 41 | + else | ||
| 42 | + { | ||
| 43 | + require $cfgfile; | ||
| 44 | + } | ||
| 45 | goto \&launcher unless $Config::AUTOLOAD =~ /launcher$/; | ||
| 46 | die "&Config::AUTOLOAD failed on $Config::AUTOLOAD"; | ||
| 47 | } | ||
diff --git a/meta/recipes-devtools/perl/perl-5.20.0/perl-configure.sh b/meta/recipes-devtools/perl/perl-5.20.0/perl-configure.sh deleted file mode 100755 index e72ce49f99..0000000000 --- a/meta/recipes-devtools/perl/perl-5.20.0/perl-configure.sh +++ /dev/null | |||
| @@ -1,43 +0,0 @@ | |||
| 1 | #! /bin/sh | ||
| 2 | |||
| 3 | # | ||
| 4 | # Generate the common perl configuration | ||
| 5 | # Needs to be run on a host that matches the bitsize of the target platform | ||
| 6 | # | ||
| 7 | |||
| 8 | echo sh Configure -des \ | ||
| 9 | -Doptimize=-O2 \ | ||
| 10 | -Dmyhostname=localhost \ | ||
| 11 | -Dperladmin=root@localhost \ | ||
| 12 | -Dcc=gcc \ | ||
| 13 | -Dcf_by='Open Embedded' \ | ||
| 14 | -Dinstallprefix=@DESTDIR@ \ | ||
| 15 | -Dprefix=/usr \ | ||
| 16 | -Dvendorprefix=/usr \ | ||
| 17 | -Dsiteprefix=/usr \ | ||
| 18 | -Dotherlibdirs=/usr/lib/perl5/5.12.3 \ | ||
| 19 | -Duseshrplib \ | ||
| 20 | -Dusethreads \ | ||
| 21 | -Duseithreads \ | ||
| 22 | -Duselargefiles \ | ||
| 23 | -Ud_dosuid \ | ||
| 24 | -Dd_semctl_semun \ | ||
| 25 | -Ui_db \ | ||
| 26 | -Ui_ndbm \ | ||
| 27 | -Ui_gdbm \ | ||
| 28 | -Di_shadow \ | ||
| 29 | -Di_syslog \ | ||
| 30 | -Dman3ext=3pm \ | ||
| 31 | -Duseperlio \ | ||
| 32 | -Dinstallusrbinperl \ | ||
| 33 | -Ubincompat5005 \ | ||
| 34 | -Uversiononly \ | ||
| 35 | -Dpager='/usr/bin/less -isr' | ||
| 36 | |||
| 37 | cp -f config.sh config.sh.COMMON | ||
| 38 | |||
| 39 | TARGETOS=$(grep myarchname config.sh.COMMON | sed "s#.*'\(.*\)'.*#\1#") | ||
| 40 | |||
| 41 | sed -r -i config.sh.COMMON \ | ||
| 42 | -e "s#(install.*=')(/usr)/local(.*')#\1@DESTDIR@\2\3#g" \ | ||
| 43 | -e 's#'$TARGETOS'#@ARCH@#g' | ||
diff --git a/meta/recipes-devtools/perl/perl-5.20.0/perl-dynloader.patch b/meta/recipes-devtools/perl/perl-5.20.0/perl-dynloader.patch deleted file mode 100644 index 035beba66a..0000000000 --- a/meta/recipes-devtools/perl/perl-5.20.0/perl-dynloader.patch +++ /dev/null | |||
| @@ -1,34 +0,0 @@ | |||
| 1 | Upstream-Status:Inappropriate [embedded specific] | ||
| 2 | |||
| 3 | Allow the location that .so files are searched for for dynamic | ||
| 4 | loading to be changed via an environment variable. This is to allow | ||
| 5 | us to load .so's from the host system while building for the target | ||
| 6 | system. | ||
| 7 | |||
| 8 | Update by Nitin A Kamble <nitin.a.kamble@intel.com> 2011/04/21 | ||
| 9 | |||
| 10 | Index: perl-5.14.2/dist/XSLoader/XSLoader_pm.PL | ||
| 11 | =================================================================== | ||
| 12 | --- perl-5.14.2.orig/dist/XSLoader/XSLoader_pm.PL | ||
| 13 | +++ perl-5.14.2/dist/XSLoader/XSLoader_pm.PL | ||
| 14 | @@ -28,6 +28,20 @@ sub load { | ||
| 15 | |||
| 16 | my ($module, $modlibname) = caller(); | ||
| 17 | |||
| 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 | ||
| 20 | + if (defined $ENV{PERLHOSTLIB}) | ||
| 21 | + { | ||
| 22 | + my $hostlib = $ENV{PERLHOSTLIB}; | ||
| 23 | + print STDERR "*** Module name IN: $modlibname\n"; | ||
| 24 | + ($p1, $p2, $p3, $p4, $p5) = $modlibname =~ m/(^(.*lib\w*\/)?)((perl\/[0-9\.]*\/)?)(.*)$/; | ||
| 25 | + print STDERR "*** p1: $p1 p3: $p3 p5: $p5\n"; | ||
| 26 | + if ( $p1 ne "" ) { | ||
| 27 | + $modlibname = $hostlib.$p5; | ||
| 28 | + } | ||
| 29 | + print STDERR "*** Module name OUT: $modlibname\n"; | ||
| 30 | + } | ||
| 31 | + | ||
| 32 | if (@_) { | ||
| 33 | $module = $_[0]; | ||
| 34 | } else { | ||
diff --git a/meta/recipes-devtools/perl/perl-5.20.0/perl-enable-gdbm.patch b/meta/recipes-devtools/perl/perl-5.20.0/perl-enable-gdbm.patch deleted file mode 100644 index aa83fca5ae..0000000000 --- a/meta/recipes-devtools/perl/perl-5.20.0/perl-enable-gdbm.patch +++ /dev/null | |||
| @@ -1,19 +0,0 @@ | |||
| 1 | Upstream-Status:Inappropriate [embedded specific] | ||
| 2 | |||
| 3 | Index: perl-5.8.8/config_h.SH | ||
| 4 | =================================================================== | ||
| 5 | --- perl-5.8.8.orig/config_h.SH 2005-11-01 02:13:05.000000000 +0800 | ||
| 6 | +++ perl-5.8.8/config_h.SH 2010-11-01 17:06:07.215219738 +0800 | ||
| 7 | @@ -709,6 +709,12 @@ | ||
| 8 | */ | ||
| 9 | #$i_float I_FLOAT /**/ | ||
| 10 | |||
| 11 | +/* I_GDBM: | ||
| 12 | + * This symbol, if defined, indicates that <gdbm.h> exists and should | ||
| 13 | + * be included. | ||
| 14 | + */ | ||
| 15 | +#$i_gdbm I_GDBM /**/ | ||
| 16 | + | ||
| 17 | /* I_LIMITS: | ||
| 18 | * This symbol, if defined, indicates to the C program that it should | ||
| 19 | * include <limits.h> to get definition of symbols like WORD_BIT or | ||
diff --git a/meta/recipes-devtools/perl/perl-5.20.0/perl-moreconfig.patch b/meta/recipes-devtools/perl/perl-5.20.0/perl-moreconfig.patch deleted file mode 100644 index 59ce85a7a3..0000000000 --- a/meta/recipes-devtools/perl/perl-5.20.0/perl-moreconfig.patch +++ /dev/null | |||
| @@ -1,18 +0,0 @@ | |||
| 1 | Upstream-Status:Inappropriate [embedded specific] | ||
| 2 | |||
| 3 | We need ld in the fake config library, but it's not included by default. So | ||
| 4 | expand the number of items included. While this works it indicates that the | ||
| 5 | rest of the config items are not being picked up and/or are being picked up | ||
| 6 | from the host. More investigation needed. | ||
| 7 | |||
| 8 | --- perl-5.8.8/configpm 2007/04/20 09:48:05 1.1 | ||
| 9 | +++ perl-5.8.8/configpm 2007/04/20 09:57:12 | ||
| 10 | @@ -2,7 +2,7 @@ | ||
| 11 | use strict; | ||
| 12 | use vars qw(%Config $Config_SH_expanded); | ||
| 13 | |||
| 14 | -my $how_many_common = 22; | ||
| 15 | +my $how_many_common = 50; | ||
| 16 | |||
| 17 | # commonly used names to precache (and hence lookup fastest) | ||
| 18 | my %Common; | ||
diff --git a/meta/recipes-devtools/perl/perl-5.20.0/run-ptest b/meta/recipes-devtools/perl/perl-5.20.0/run-ptest deleted file mode 100644 index 1e2dd1b66d..0000000000 --- a/meta/recipes-devtools/perl/perl-5.20.0/run-ptest +++ /dev/null | |||
| @@ -1,2 +0,0 @@ | |||
| 1 | #!/bin/sh | ||
| 2 | cd t && ./TEST | sed -u -e 's|\(.*\) .* ok$|PASS: \1|' -e 's|\(.*\) .* skipped|SKIP: \1|' -e 's|\(.*\) \.\(.*\)|FAIL: \1|' | ||
diff --git a/meta/recipes-devtools/perl/perl-5.20.0/test/dist-threads-t-join.t-adjust-ps-option.patch b/meta/recipes-devtools/perl/perl-5.20.0/test/dist-threads-t-join.t-adjust-ps-option.patch deleted file mode 100644 index 08a6b0a5fd..0000000000 --- a/meta/recipes-devtools/perl/perl-5.20.0/test/dist-threads-t-join.t-adjust-ps-option.patch +++ /dev/null | |||
| @@ -1,38 +0,0 @@ | |||
| 1 | dist/threads/t/join.t: adjust ps option | ||
| 2 | |||
| 3 | The ps's option '-f' is not supported by busybox in oe. | ||
| 4 | |||
| 5 | Upstream-Status: [oe specific] | ||
| 6 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | ||
| 7 | --- | ||
| 8 | dist/threads/t/join.t | 6 +++--- | ||
| 9 | 1 file changed, 3 insertions(+), 3 deletions(-) | ||
| 10 | |||
| 11 | diff --git a/dist/threads/t/join.t b/dist/threads/t/join.t | ||
| 12 | --- a/dist/threads/t/join.t | ||
| 13 | +++ b/dist/threads/t/join.t | ||
| 14 | @@ -118,7 +118,7 @@ if ($^O eq 'linux') { | ||
| 15 | })->join; | ||
| 16 | #print "# mainthread: \$0 = $0\n"; | ||
| 17 | #print "# pid = $$\n"; | ||
| 18 | - if (open PS, "ps -f |") { # Note: must work in (all) systems. | ||
| 19 | + if (open PS, "ps |") { # Note: must work in (all) systems. | ||
| 20 | my ($sawpid, $sawexe); | ||
| 21 | while (<PS>) { | ||
| 22 | chomp; | ||
| 23 | @@ -135,10 +135,10 @@ if ($^O eq 'linux') { | ||
| 24 | if ($sawpid) { | ||
| 25 | ok($sawpid && $sawexe, 'altering $0 is effective'); | ||
| 26 | } else { | ||
| 27 | - skip("\$0 check: did not see pid $$ in 'ps -f |'"); | ||
| 28 | + skip("\$0 check: did not see pid $$ in 'ps |'"); | ||
| 29 | } | ||
| 30 | } else { | ||
| 31 | - skip("\$0 check: opening 'ps -f |' failed: $!"); | ||
| 32 | + skip("\$0 check: opening 'ps |' failed: $!"); | ||
| 33 | } | ||
| 34 | } else { | ||
| 35 | skip("\$0 check: only on Linux"); | ||
| 36 | -- | ||
| 37 | 1.8.1.2 | ||
| 38 | |||
diff --git a/meta/recipes-devtools/perl/perl-5.20.0/test/ext-DynaLoader-t-DynaLoader.t-fix-calling-dl_findfil.patch b/meta/recipes-devtools/perl/perl-5.20.0/test/ext-DynaLoader-t-DynaLoader.t-fix-calling-dl_findfil.patch deleted file mode 100644 index 1ee818c27b..0000000000 --- a/meta/recipes-devtools/perl/perl-5.20.0/test/ext-DynaLoader-t-DynaLoader.t-fix-calling-dl_findfil.patch +++ /dev/null | |||
| @@ -1,26 +0,0 @@ | |||
| 1 | ext/DynaLoader/t/DynaLoader.t: fix calling dl_findfile() failed | ||
| 2 | |||
| 3 | Use '$Config{libc}' as the libc file name | ||
| 4 | |||
| 5 | Upstream-Status: oe specific | ||
| 6 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | ||
| 7 | --- | ||
| 8 | ext/DynaLoader/t/DynaLoader.t | 2 +- | ||
| 9 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 10 | |||
| 11 | diff --git a/ext/DynaLoader/t/DynaLoader.t b/ext/DynaLoader/t/DynaLoader.t | ||
| 12 | index ade1f8e..3567afe 100644 | ||
| 13 | --- a/ext/DynaLoader/t/DynaLoader.t | ||
| 14 | +++ b/ext/DynaLoader/t/DynaLoader.t | ||
| 15 | @@ -106,7 +106,7 @@ ok( defined $dlerr, "dl_error() returning an error message: '$dlerr'" ); | ||
| 16 | # ... dl_findfile() | ||
| 17 | SKIP: { | ||
| 18 | my @files = (); | ||
| 19 | - eval { @files = DynaLoader::dl_findfile("c") }; | ||
| 20 | + eval { @files = DynaLoader::dl_findfile($Config{libc}) }; | ||
| 21 | is( $@, '', "calling dl_findfile()" ); | ||
| 22 | # Some platforms are known to not have a "libc" | ||
| 23 | # (not at least by that name) that the dl_findfile() | ||
| 24 | -- | ||
| 25 | 1.8.1.2 | ||
| 26 | |||