From: Tim Orling Date: Fri, 7 Sep 2018 05:00:25 +0000 (-0700) Subject: perl: [WIP] upgrade to 5.26.2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=610991e483d2cf6a6b82322406630ed30547e844;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git perl: [WIP] upgrade to 5.26.2 Bring in patches from debian, best effort at getting past do_patch task. Needs more work. Signed-off-by: Tim Orling --- diff --git a/meta/recipes-devtools/perl/perl-native_5.24.4.bb b/meta/recipes-devtools/perl/perl-native_5.26.2.bb similarity index 57% rename from meta/recipes-devtools/perl/perl-native_5.24.4.bb rename to meta/recipes-devtools/perl/perl-native_5.26.2.bb index affc9d5d78a..acac9dc6de1 100644 --- a/meta/recipes-devtools/perl/perl-native_5.24.4.bb +++ b/meta/recipes-devtools/perl/perl-native_5.26.2.bb @@ -5,21 +5,69 @@ DEPENDS = "db-native grep-native gdbm-native zlib-native" EXTRA_OEMAKE = "-e MAKEFLAGS=" +#file://debian/hppa_opmini_optimize_workaround.diff +#file://debian/hurd-softupdates.diff +#file://debian/no_packlist_perllocal.diff +#file://debian/prune_libs.diff +#file://debian/sh4_op_optimize_workaround.diff +#file://debian/writable_site_dirs.diff +#file://fixes/rename-filexp.U-phase2.diff +#file://fixes/test-printf-null.diff SRC_URI += "\ - file://Configure-multilib.patch \ - file://perl-configpm-switch.patch \ - file://native-nopacklist.patch \ - file://native-perlinc.patch \ - file://MM_Unix.pm.patch \ - file://debian/errno_ver.diff \ - file://dynaloaderhack.patch \ - file://perl-PathTools-don-t-filter-out-blib-from-INC.patch \ - file://0001-Configure-Remove-fstack-protector-strong-for-native-.patch \ - file://perl-5.26.1-guard_old_libcrypt_fix.patch \ - " - -SRC_URI[md5sum] = "04622bc4d3941dc7eb571c52b7c02993" -SRC_URI[sha256sum] = "7f080287ff64750270689843ae945f02159a33cb8f2fc910248c15befba5db84" + file://debian/configure-regen.diff \ + file://debian/cpan_definstalldirs.diff \ + file://debian/cpan-missing-site-dirs.diff \ + file://debian/db_file_ver.diff \ + file://debian/deprecate-with-apt.diff \ + file://debian/doc_info.diff \ + file://debian/enc2xs_inc.diff \ + file://debian/errno_ver.diff \ + file://debian/extutils_set_libperl_path.diff \ + file://debian/fakeroot.diff \ + file://debian/find_html2text.diff \ + file://debian/hppa_op_optimize_workaround.diff \ + file://debian/installman-utf8.diff \ + file://debian/instmodsh_doc.diff \ + file://debian/kfreebsd-softupdates.diff \ + file://debian/ld_run_path.diff \ + file://debian/libnet_config_path.diff \ + file://debian/libperl_embed_doc.diff \ + file://debian/makemaker-manext.diff \ + file://debian/makemaker-pasthru.diff \ + file://debian/mod_paths.diff \ + file://debian/patchlevel.diff \ + file://debian/perl5db-x-terminal-emulator.patch \ + file://debian/perldoc-pager.diff \ + file://debian/perlivp.diff \ + file://debian/squelch-locale-warnings.diff \ + file://fixes/autodie-scope.diff \ + file://fixes/cpan_web_link.diff \ + file://fixes/CVE-2018-12015-Archive-Tar-directory-traversal.diff \ + file://fixes/CVE-2018-6797-testcase.diff \ + file://fixes/document_makemaker_ccflags.diff \ + file://fixes/encode-alias-regexp.diff \ + file://fixes/extutils_file_path_compat.diff \ + file://fixes/extutils_makemaker_reproducible.diff \ + file://fixes/file_path_chmod_race.diff \ + file://fixes/file_path_hurd_errno.diff \ + file://fixes/getopt-long-2.diff \ + file://fixes/getopt-long-3.diff \ + file://fixes/getopt-long-4.diff \ + file://fixes/json-pp-example.diff \ + file://fixes/math_complex_doc_angle_units.diff \ + file://fixes/math_complex_doc_great_circle.diff \ + file://fixes/math_complex_doc_see_also.diff \ + file://fixes/memoize-pod.diff \ + file://fixes/memoize_storable_nstore.diff \ + file://fixes/packaging_test_skips.diff \ + file://fixes/rename-filexp.U-phase1.diff \ + file://fixes/respect_umask.diff \ + file://fixes/test-builder-reset.diff \ + file://fixes/time_piece_doc.diff \ + " + +SRC_URI[md5sum] = "1fa1b53eeff76aa37b17bfc9b2771671" +SRC_URI[sha256sum] = "0f8c0fb1b0db4681adb75c3ba0dd77a0472b1b359b9e80efd79fc27b4352132c" inherit native @@ -135,5 +183,5 @@ EOF # Fix the path in sstate SSTATE_SCAN_FILES += "*.pm *.pod *.h *.pl *.sh" +PACKAGES_DYNAMIC_class-native += "^perl-module-.*native$" -PACKAGES_DYNAMIC_class-native = "^perl-module-.*native$" diff --git a/meta/recipes-devtools/perl/perl-rdepends_5.24.4.inc b/meta/recipes-devtools/perl/perl-rdepends_5.26.2.inc similarity index 100% rename from meta/recipes-devtools/perl/perl-rdepends_5.24.4.inc rename to meta/recipes-devtools/perl/perl-rdepends_5.26.2.inc diff --git a/meta/recipes-devtools/perl/perl/Makefile.patch b/meta/recipes-devtools/perl/perl/Makefile.patch index 858e2e10fb8..9bad6b4debf 100644 --- a/meta/recipes-devtools/perl/perl/Makefile.patch +++ b/meta/recipes-devtools/perl/perl/Makefile.patch @@ -1,9 +1,18 @@ +From 02b98c2bfe7d6b8e2034ea76c59d4301a8bf94b2 Mon Sep 17 00:00:00 2001 +From: Richard Purdie +Date: Wed, 31 Aug 2005 10:45:47 +0000 +Subject: [PATCH] Initial population + Upstream-Status:Inappropriate [embedded specific] -Index: perl-5.14.2/Cross/Makefile -=================================================================== ---- perl-5.14.2.orig/Cross/Makefile -+++ perl-5.14.2/Cross/Makefile +--- + Cross/Makefile | 24 +++++++----------------- + 1 file changed, 7 insertions(+), 17 deletions(-) + +diff --git a/Cross/Makefile b/Cross/Makefile +index 1c91b29..0064336 100644 +--- a/Cross/Makefile ++++ b/Cross/Makefile @@ -1,6 +1,7 @@ ## Toplevel Makefile for cross-compilation of perl diff --git a/meta/recipes-devtools/perl/perl/bitbake-cookerdaemon.log b/meta/recipes-devtools/perl/perl/bitbake-cookerdaemon.log new file mode 100644 index 00000000000..1d618b63cb7 --- /dev/null +++ b/meta/recipes-devtools/perl/perl/bitbake-cookerdaemon.log @@ -0,0 +1,149 @@ +--- Starting bitbake server pid 12649 at 2018-07-05 21:16:13.428575 --- +Started bitbake server pid 12649 +DEBUG: Found bblayers.conf (/var/build/build-timo-perl-5.28.0/conf/bblayers.conf) +DEBUG: Adding layer /home/ttorling/Projects/openembedded-core/meta +DEBUG: CONF /home/ttorling/Projects/openembedded-core/meta/conf/bitbake.conf:746: including conf/abi_version.conf +DEBUG: CONF /home/ttorling/Projects/openembedded-core/meta/conf/bitbake.conf:747: including conf/site.conf +DEBUG: CONF file 'conf/site.conf' not found +DEBUG: CONF /home/ttorling/Projects/openembedded-core/meta/conf/bitbake.conf:748: including conf/auto.conf +DEBUG: CONF file 'conf/auto.conf' not found +DEBUG: CONF /home/ttorling/Projects/openembedded-core/meta/conf/bitbake.conf:749: including conf/local.conf +DEBUG: CONF /home/ttorling/Projects/openembedded-core/meta/conf/bitbake.conf:750: including conf/multiconfig/default.conf +DEBUG: CONF /home/ttorling/Projects/openembedded-core/meta/conf/bitbake.conf:751: including conf/machine/qemux86.conf +DEBUG: CONF /home/ttorling/Projects/openembedded-core/meta/conf/machine/qemux86.conf:10: including conf/machine/include/qemu.inc +DEBUG: CONF /home/ttorling/Projects/openembedded-core/meta/conf/machine/qemux86.conf:11: including conf/machine/include/tune-i586.inc +DEBUG: CONF /home/ttorling/Projects/openembedded-core/meta/conf/machine/include/tune-i586.inc:3: including conf/machine/include/x86/arch-x86.inc +DEBUG: CONF /home/ttorling/Projects/openembedded-core/meta/conf/machine/qemux86.conf:12: including conf/machine/include/qemuboot-x86.inc +DEBUG: CONF /home/ttorling/Projects/openembedded-core/meta/conf/bitbake.conf:752: including conf/machine-sdk/x86_64.conf +DEBUG: CONF /home/ttorling/Projects/openembedded-core/meta/conf/bitbake.conf:753: including conf/distro/nodistro.conf +DEBUG: CONF file 'conf/distro/nodistro.conf' not found +DEBUG: CONF /home/ttorling/Projects/openembedded-core/meta/conf/bitbake.conf:754: including conf/distro/defaultsetup.conf +DEBUG: CONF /home/ttorling/Projects/openembedded-core/meta/conf/distro/defaultsetup.conf:1: including conf/distro/include/default-providers.inc +DEBUG: CONF /home/ttorling/Projects/openembedded-core/meta/conf/distro/defaultsetup.conf:2: including conf/distro/include/default-versions.inc +DEBUG: CONF /home/ttorling/Projects/openembedded-core/meta/conf/distro/defaultsetup.conf:3: including conf/distro/include/default-distrovars.inc +DEBUG: CONF /home/ttorling/Projects/openembedded-core/meta/conf/distro/defaultsetup.conf:4: including conf/distro/include/world-broken.inc +DEBUG: CONF /home/ttorling/Projects/openembedded-core/meta/conf/distro/defaultsetup.conf:7: including conf/distro/include/tcmode-default.inc +DEBUG: CONF /home/ttorling/Projects/openembedded-core/meta/conf/distro/defaultsetup.conf:10: including conf/distro/include/tclibc-glibc.inc +DEBUG: CONF /home/ttorling/Projects/openembedded-core/meta/conf/distro/defaultsetup.conf:12: including conf/distro/include/uninative-flags.inc +DEBUG: CONF /home/ttorling/Projects/openembedded-core/meta/conf/bitbake.conf:755: including conf/documentation.conf +DEBUG: CONF /home/ttorling/Projects/openembedded-core/meta/conf/bitbake.conf:756: including conf/licenses.conf +DEBUG: CONF /home/ttorling/Projects/openembedded-core/meta/conf/bitbake.conf:757: including conf/sanity.conf +DEBUG: Inheriting /home/ttorling/Projects/openembedded-core/meta/classes/base.bbclass (from configuration INHERITs:0) +DEBUG: Inheriting /home/ttorling/Projects/openembedded-core/meta/classes/patch.bbclass (from /home/ttorling/Projects/openembedded-core/meta/classes/base.bbclass:4) +DEBUG: Inheriting /home/ttorling/Projects/openembedded-core/meta/classes/terminal.bbclass (from /home/ttorling/Projects/openembedded-core/meta/classes/patch.bbclass:11) +DEBUG: Inheriting /home/ttorling/Projects/openembedded-core/meta/classes/staging.bbclass (from /home/ttorling/Projects/openembedded-core/meta/classes/base.bbclass:5) +DEBUG: Inheriting /home/ttorling/Projects/openembedded-core/meta/classes/mirrors.bbclass (from /home/ttorling/Projects/openembedded-core/meta/classes/base.bbclass:7) +DEBUG: Inheriting /home/ttorling/Projects/openembedded-core/meta/classes/utils.bbclass (from /home/ttorling/Projects/openembedded-core/meta/classes/base.bbclass:8) +DEBUG: Inheriting /home/ttorling/Projects/openembedded-core/meta/classes/utility-tasks.bbclass (from /home/ttorling/Projects/openembedded-core/meta/classes/base.bbclass:9) +DEBUG: Inheriting /home/ttorling/Projects/openembedded-core/meta/classes/metadata_scm.bbclass (from /home/ttorling/Projects/openembedded-core/meta/classes/base.bbclass:10) +DEBUG: Inheriting /home/ttorling/Projects/openembedded-core/meta/classes/logging.bbclass (from /home/ttorling/Projects/openembedded-core/meta/classes/base.bbclass:11) +DEBUG: Inheriting /home/ttorling/Projects/openembedded-core/meta/classes/package_ipk.bbclass (from configuration INHERITs:0) +DEBUG: Inheriting /home/ttorling/Projects/openembedded-core/meta/classes/package.bbclass (from /home/ttorling/Projects/openembedded-core/meta/classes/package_ipk.bbclass:1) +DEBUG: Inheriting /home/ttorling/Projects/openembedded-core/meta/classes/packagedata.bbclass (from /home/ttorling/Projects/openembedded-core/meta/classes/package.bbclass:41) +DEBUG: Inheriting /home/ttorling/Projects/openembedded-core/meta/classes/chrpath.bbclass (from /home/ttorling/Projects/openembedded-core/meta/classes/package.bbclass:42) +DEBUG: Inheriting /home/ttorling/Projects/openembedded-core/meta/classes/insane.bbclass (from /home/ttorling/Projects/openembedded-core/meta/classes/package.bbclass:45) +DEBUG: Inheriting /home/ttorling/Projects/openembedded-core/meta/classes/buildstats.bbclass (from configuration INHERITs:0) +DEBUG: Inheriting /home/ttorling/Projects/openembedded-core/meta/classes/image-mklibs.bbclass (from configuration INHERITs:0) +DEBUG: Inheriting /home/ttorling/Projects/openembedded-core/meta/classes/linuxloader.bbclass (from /home/ttorling/Projects/openembedded-core/meta/classes/image-mklibs.bbclass:5) +DEBUG: Inheriting /home/ttorling/Projects/openembedded-core/meta/classes/image-prelink.bbclass (from configuration INHERITs:0) +DEBUG: Inheriting /home/ttorling/Projects/openembedded-core/meta/classes/debian.bbclass (from configuration INHERITs:0) +DEBUG: Inheriting /home/ttorling/Projects/openembedded-core/meta/classes/devshell.bbclass (from configuration INHERITs:0) +DEBUG: Inheriting /home/ttorling/Projects/openembedded-core/meta/classes/sstate.bbclass (from configuration INHERITs:0) +DEBUG: Inheriting /home/ttorling/Projects/openembedded-core/meta/classes/license.bbclass (from configuration INHERITs:0) +DEBUG: Inheriting /home/ttorling/Projects/openembedded-core/meta/classes/remove-libtool.bbclass (from configuration INHERITs:0) +DEBUG: Inheriting /home/ttorling/Projects/openembedded-core/meta/classes/blacklist.bbclass (from configuration INHERITs:0) +DEBUG: Inheriting /home/ttorling/Projects/openembedded-core/meta/classes/sanity.bbclass (from configuration INHERITs:0) +DEBUG: Clearing SRCREV cache due to cache policy of: clear +DEBUG: Using cache in '/var/build/build-timo-perl-5.28.0/cache/local_file_checksum_cache.dat' +DEBUG: Using cache in '/var/build/build-timo-perl-5.28.0/cache/bb_codeparser.dat' +Entering server connection loop +Accepting [] +Connecting Client +Running command ['setFeatures', [2]] +Running command ['updateConfig', {'abort': True, 'force': False, 'invalidate_stamp': None, 'verbose': False, 'debug': 0, 'dry_run': False, 'dump_signatures': [], 'debug_domains': [], 'extra_assume_provided': [], 'profile': False, 'prefile': [], 'postfile': [], 'server_timeout': None}, {'HTTP_PROXY': 'http://proxy-us.intel.com:911/', 'USER': 'ttorling', 'FTP_PROXY': 'http://proxy.jf.intel.com:1080/', 'PWD': '/home/ttorling/Projects/openembedded-core/meta/recipes-devtools/perl/perl', 'HOME': '/home/ttorling', 'BBPATH': '/var/build/build-timo-perl-5.28.0', 'https_proxy': 'https://proxy-us.intel.com:912/', 'http_proxy': 'http://proxy-us.intel.com:911/', 'BB_ENV_EXTRAWHITE': 'ALL_PROXY BBPATH_EXTRA BB_NO_NETWORK BB_NUMBER_THREADS BB_SETSCENE_ENFORCE BB_SRCREV_POLICY DISTRO FTPS_PROXY FTP_PROXY GIT_PROXY_COMMAND HTTPS_PROXY HTTP_PROXY MACHINE NO_PROXY PARALLEL_MAKE SCREENDIR SDKMACHINE SOCKS5_PASSWD SOCKS5_USER SSH_AGENT_PID SSH_AUTH_SOCK STAMPS_DIR TCLIBC TCMODE all_proxy ftp_proxy ftps_proxy http_proxy https_proxy no_proxy ', 'ALL_PROXY': 'socks://proxy-us.intel.com:1080/', 'no_proxy': '*.jf.intel.com,*.ostc.intel.com,*.devtools.intel.com, certificates.intel.com', 'NO_PROXY': '*.jf.intel.com,*.ostc.intel.com,*.devtools.intel.com, certificates.intel.com', 'GIT_PROXY_COMMAND': '/usr/bin/oe-git-proxy', 'HTTPS_PROXY': 'https://proxy-us.intel.com:912/', 'TERM': 'xterm-256color', 'SHELL': '/bin/bash', 'all_proxy': 'socks://proxy-us.intel.com:1080/', 'LOGNAME': 'ttorling', 'PATH': '/home/ttorling/Projects/openembedded-core/scripts:/home/ttorling/Projects/bitbake/bin:/usr/libexec/python3-sphinx:/usr/lib64/ccache:/usr/local/bin:/usr/bin:/usr/local/sbin:/usr/sbin:/home/ttorling/.local/bin:/home/ttorling/bin', 'ftp_proxy': 'http://proxy-us.intel.com:1080/', 'LC_ALL': 'en_US.UTF-8', 'LS_COLORS': 'no=00:fi=00:di=34:ow=34;40:ln=35:pi=30;44:so=35;44:do=35;44:bd=33;44:cd=37;44:or=05;37;41:mi=05;37;41:ex=01;31:*.cmd=01;31:*.exe=01;31:*.com=01;31:*.bat=01;31:*.reg=01;31:*.app=01;31:*.txt=32:*.org=32:*.md=32:*.mkd=32:*.h=32:*.hpp=32:*.c=32:*.C=32:*.cc=32:*.cpp=32:*.cxx=32:*.objc=32:*.cl=32:*.sh=32:*.bash=32:*.csh=32:*.zsh=32:*.el=32:*.vim=32:*.java=32:*.pl=32:*.pm=32:*.py=32:*.rb=32:*.hs=32:*.php=32:*.htm=32:*.html=32:*.shtml=32:*.erb=32:*.haml=32:*.xml=32:*.rdf=32:*.css=32:*.sass=32:*.scss=32:*.less=32:*.js=32:*.coffee=32:*.man=32:*.0=32:*.1=32:*.2=32:*.3=32:*.4=32:*.5=32:*.6=32:*.7=32:*.8=32:*.9=32:*.l=32:*.n=32:*.p=32:*.pod=32:*.tex=32:*.go=32:*.sql=32:*.csv=32:*.bmp=33:*.cgm=33:*.dl=33:*.dvi=33:*.emf=33:*.eps=33:*.gif=33:*.jpeg=33:*.jpg=33:*.JPG=33:*.mng=33:*.pbm=33:*.pcx=33:*.pdf=33:*.pgm=33:*.png=33:*.PNG=33:*.ppm=33:*.pps=33:*.ppsx=33:*.ps=33:*.svg=33:*.svgz=33:*.tga=33:*.tif=33:*.tiff=33:*.xbm=33:*.xcf=33:*.xpm=33:*.xwd=33:*.xwd=33:*.yuv=33:*.aac=33:*.au=33:*.flac=33:*.m4a=33:*.mid=33:*.midi=33:*.mka=33:*.mp3=33:*.mpa=33:*.mpeg=33:*.mpg=33:*.ogg=33:*.opus=33:*.ra=33:*.wav=33:*.anx=33:*.asf=33:*.avi=33:*.axv=33:*.flc=33:*.fli=33:*.flv=33:*.gl=33:*.m2v=33:*.m4v=33:*.mkv=33:*.mov=33:*.MOV=33:*.mp4=33:*.mp4v=33:*.mpeg=33:*.mpg=33:*.nuv=33:*.ogm=33:*.ogv=33:*.ogx=33:*.qt=33:*.rm=33:*.rmvb=33:*.swf=33:*.vob=33:*.webm=33:*.wmv=33:*.doc=31:*.docx=31:*.rtf=31:*.odt=31:*.dot=31:*.dotx=31:*.ott=31:*.xls=31:*.xlsx=31:*.ods=31:*.ots=31:*.ppt=31:*.pptx=31:*.odp=31:*.otp=31:*.fla=31:*.psd=31:*.7z=1;35:*.apk=1;35:*.arj=1;35:*.bin=1;35:*.bz=1;35:*.bz2=1;35:*.cab=1;35:*.deb=1;35:*.dmg=1;35:*.gem=1;35:*.gz=1;35:*.iso=1;35:*.jar=1;35:*.msi=1;35:*.rar=1;35:*.rpm=1;35:*.tar=1;35:*.tbz=1;35:*.tbz2=1;35:*.tgz=1;35:*.tx=1;35:*.war=1;35:*.xpi=1;35:*.xz=1;35:*.z=1;35:*.Z=1;35:*.zip=1;35:*.ANSI-30-black=30:*.ANSI-01;30-brblack=01;30:*.ANSI-31-red=31:*.ANSI-01;31-brred=01;31:*.ANSI-32-green=32:*.ANSI-01;32-brgreen=01;32:*.ANSI-33-yellow=33:*.ANSI-01;33-bryellow=01;33:*.ANSI-34-blue=34:*.ANSI-01;34-brblue=01;34:*.ANSI-35-magenta=35:*.ANSI-01;35-brmagenta=01;35:*.ANSI-36-cyan=36:*.ANSI-01;36-brcyan=01;36:*.ANSI-37-white=37:*.ANSI-01;37-brwhite=01;37:*.log=01;32:*~=01;32:*#=01;32:*.bak=01;33:*.BAK=01;33:*.old=01;33:*.OLD=01;33:*.org_archive=01;33:*.off=01;33:*.OFF=01;33:*.dist=01;33:*.DIST=01;33:*.orig=01;33:*.ORIG=01;33:*.swp=01;33:*.swo=01;33:*,v=01;33:*.gpg=34:*.gpg=34:*.pgp=34:*.asc=34:*.3des=34:*.aes=34:*.enc=34:*.sqlite=34:', 'SSH_CONNECTION': '10.254.107.201 59657 10.54.74.39 22', 'LANG': 'en_US.UTF-8', 'HISTCONTROL': 'ignoredups', 'GUESTFISH_RESTORE': '\\e[0m', 'HOSTNAME': 'chiron.jf.intel.com', 'OLDPWD': '/home/ttorling/Projects/openembedded-core/meta/recipes-devtools/perl/perl/debian', 'GUESTFISH_INIT': '\\e[1;34m', 'XDG_SESSION_ID': '4715', 'GUESTFISH_PS1': '\\[\\e[1;32m\\]>\\[\\e[0;31m\\] ', 'SELINUX_ROLE_REQUESTED': '', 'SSH_CLIENT': '10.254.107.201 59657 22', 'SELINUX_LEVEL_REQUESTED': '', 'XDG_DATA_DIRS': '/home/ttorling/.local/share/flatpak/exports/share:/var/lib/flatpak/exports/share:/usr/local/share:/usr/share', 'LOADEDMODULES': 'python-sphinx/python3-sphinx', 'BUILDDIR': '/var/build/build-timo-perl-5.28.0', 'SSH_TTY': '/dev/pts/5', 'MAIL': '/var/spool/mail/ttorling', 'SOCKS_PROXY': 'socks://proxy-us.intel.com:1080/', 'socks_proxy': 'socks://proxy-us.intel.com:1080/', 'SELINUX_USE_CURRENT_RANGE': '', 'SHLVL': '1', 'MODULEPATH': '/etc/scl/modulefiles:/usr/share/Modules/modulefiles:/etc/modulefiles:/usr/share/modulefiles', 'DBUS_SESSION_BUS_ADDRESS': 'unix:path=/run/user/1000/bus', 'XDG_RUNTIME_DIR': '/run/user/1000', '_LMFILES_': '/usr/share/modulefiles/python-sphinx/python3-sphinx', 'GUESTFISH_OUTPUT': '\\e[0m', 'MODULESHOME': '/usr/share/Modules', 'HISTSIZE': '1000', 'LESSOPEN': '||/usr/bin/lesspipe.sh %s', 'BASH_FUNC_module%%': '() { eval `/usr/bin/modulecmd bash $*`\n}', 'BASH_FUNC_scl%%': '() { if [ "$1" = "load" -o "$1" = "unload" ]; then\n eval "module $@";\n else\n /usr/bin/scl "$@";\n fi\n}', '_': '/home/ttorling/Projects/bitbake/bin/bitbake'}, ['/home/ttorling/Projects/bitbake/bin/bitbake', 'perl-native', '-c', 'cleanall']] +Running command ['getVariable', 'BBINCLUDELOGS'] +Running command ['getVariable', 'BBINCLUDELOGS_LINES'] +Running command ['getSetVariable', 'BB_CONSOLELOG'] +Running command ['getUIHandlerNum'] +Running command ['setEventMask', 1, 20, {}, ['bb.runqueue.runQueueExitWait', 'bb.event.LogExecTTY', 'logging.LogRecord', 'bb.build.TaskFailed', 'bb.build.TaskBase', 'bb.event.ParseStarted', 'bb.event.ParseProgress', 'bb.event.ParseCompleted', 'bb.event.CacheLoadStarted', 'bb.event.CacheLoadProgress', 'bb.event.CacheLoadCompleted', 'bb.command.CommandFailed', 'bb.command.CommandExit', 'bb.command.CommandCompleted', 'bb.cooker.CookerExit', 'bb.event.MultipleProviders', 'bb.event.NoProvider', 'bb.runqueue.sceneQueueTaskStarted', 'bb.runqueue.runQueueTaskStarted', 'bb.runqueue.runQueueTaskFailed', 'bb.runqueue.sceneQueueTaskFailed', 'bb.event.BuildBase', 'bb.build.TaskStarted', 'bb.build.TaskSucceeded', 'bb.build.TaskFailedSilent', 'bb.build.TaskProgress', 'bb.event.ProcessStarted', 'bb.event.ProcessProgress', 'bb.event.ProcessFinished']] +Running command ['setConfig', 'cmd', 'cleanall'] +Running command ['buildTargets', ['perl-native'], 'cleanall'] +Connecting Client +Disconnecting Client +No timeout, exiting. +Exiting +--- Starting bitbake server pid 12671 at 2018-07-05 21:16:22.503888 --- +Started bitbake server pid 12671 +DEBUG: Found bblayers.conf (/var/build/build-timo-perl-5.28.0/conf/bblayers.conf) +DEBUG: Adding layer /home/ttorling/Projects/openembedded-core/meta +DEBUG: CONF /home/ttorling/Projects/openembedded-core/meta/conf/bitbake.conf:746: including conf/abi_version.conf +DEBUG: CONF /home/ttorling/Projects/openembedded-core/meta/conf/bitbake.conf:747: including conf/site.conf +DEBUG: CONF file 'conf/site.conf' not found +DEBUG: CONF /home/ttorling/Projects/openembedded-core/meta/conf/bitbake.conf:748: including conf/auto.conf +DEBUG: CONF file 'conf/auto.conf' not found +DEBUG: CONF /home/ttorling/Projects/openembedded-core/meta/conf/bitbake.conf:749: including conf/local.conf +DEBUG: CONF /home/ttorling/Projects/openembedded-core/meta/conf/bitbake.conf:750: including conf/multiconfig/default.conf +DEBUG: CONF /home/ttorling/Projects/openembedded-core/meta/conf/bitbake.conf:751: including conf/machine/qemux86.conf +DEBUG: CONF /home/ttorling/Projects/openembedded-core/meta/conf/machine/qemux86.conf:10: including conf/machine/include/qemu.inc +DEBUG: CONF /home/ttorling/Projects/openembedded-core/meta/conf/machine/qemux86.conf:11: including conf/machine/include/tune-i586.inc +DEBUG: CONF /home/ttorling/Projects/openembedded-core/meta/conf/machine/include/tune-i586.inc:3: including conf/machine/include/x86/arch-x86.inc +DEBUG: CONF /home/ttorling/Projects/openembedded-core/meta/conf/machine/qemux86.conf:12: including conf/machine/include/qemuboot-x86.inc +DEBUG: CONF /home/ttorling/Projects/openembedded-core/meta/conf/bitbake.conf:752: including conf/machine-sdk/x86_64.conf +DEBUG: CONF /home/ttorling/Projects/openembedded-core/meta/conf/bitbake.conf:753: including conf/distro/nodistro.conf +DEBUG: CONF file 'conf/distro/nodistro.conf' not found +DEBUG: CONF /home/ttorling/Projects/openembedded-core/meta/conf/bitbake.conf:754: including conf/distro/defaultsetup.conf +DEBUG: CONF /home/ttorling/Projects/openembedded-core/meta/conf/distro/defaultsetup.conf:1: including conf/distro/include/default-providers.inc +DEBUG: CONF /home/ttorling/Projects/openembedded-core/meta/conf/distro/defaultsetup.conf:2: including conf/distro/include/default-versions.inc +DEBUG: CONF /home/ttorling/Projects/openembedded-core/meta/conf/distro/defaultsetup.conf:3: including conf/distro/include/default-distrovars.inc +DEBUG: CONF /home/ttorling/Projects/openembedded-core/meta/conf/distro/defaultsetup.conf:4: including conf/distro/include/world-broken.inc +DEBUG: CONF /home/ttorling/Projects/openembedded-core/meta/conf/distro/defaultsetup.conf:7: including conf/distro/include/tcmode-default.inc +DEBUG: CONF /home/ttorling/Projects/openembedded-core/meta/conf/distro/defaultsetup.conf:10: including conf/distro/include/tclibc-glibc.inc +DEBUG: CONF /home/ttorling/Projects/openembedded-core/meta/conf/distro/defaultsetup.conf:12: including conf/distro/include/uninative-flags.inc +DEBUG: CONF /home/ttorling/Projects/openembedded-core/meta/conf/bitbake.conf:755: including conf/documentation.conf +DEBUG: CONF /home/ttorling/Projects/openembedded-core/meta/conf/bitbake.conf:756: including conf/licenses.conf +DEBUG: CONF /home/ttorling/Projects/openembedded-core/meta/conf/bitbake.conf:757: including conf/sanity.conf +DEBUG: Inheriting /home/ttorling/Projects/openembedded-core/meta/classes/base.bbclass (from configuration INHERITs:0) +DEBUG: Inheriting /home/ttorling/Projects/openembedded-core/meta/classes/patch.bbclass (from /home/ttorling/Projects/openembedded-core/meta/classes/base.bbclass:4) +DEBUG: Inheriting /home/ttorling/Projects/openembedded-core/meta/classes/terminal.bbclass (from /home/ttorling/Projects/openembedded-core/meta/classes/patch.bbclass:11) +DEBUG: Inheriting /home/ttorling/Projects/openembedded-core/meta/classes/staging.bbclass (from /home/ttorling/Projects/openembedded-core/meta/classes/base.bbclass:5) +DEBUG: Inheriting /home/ttorling/Projects/openembedded-core/meta/classes/mirrors.bbclass (from /home/ttorling/Projects/openembedded-core/meta/classes/base.bbclass:7) +DEBUG: Inheriting /home/ttorling/Projects/openembedded-core/meta/classes/utils.bbclass (from /home/ttorling/Projects/openembedded-core/meta/classes/base.bbclass:8) +DEBUG: Inheriting /home/ttorling/Projects/openembedded-core/meta/classes/utility-tasks.bbclass (from /home/ttorling/Projects/openembedded-core/meta/classes/base.bbclass:9) +DEBUG: Inheriting /home/ttorling/Projects/openembedded-core/meta/classes/metadata_scm.bbclass (from /home/ttorling/Projects/openembedded-core/meta/classes/base.bbclass:10) +DEBUG: Inheriting /home/ttorling/Projects/openembedded-core/meta/classes/logging.bbclass (from /home/ttorling/Projects/openembedded-core/meta/classes/base.bbclass:11) +DEBUG: Inheriting /home/ttorling/Projects/openembedded-core/meta/classes/package_ipk.bbclass (from configuration INHERITs:0) +DEBUG: Inheriting /home/ttorling/Projects/openembedded-core/meta/classes/package.bbclass (from /home/ttorling/Projects/openembedded-core/meta/classes/package_ipk.bbclass:1) +DEBUG: Inheriting /home/ttorling/Projects/openembedded-core/meta/classes/packagedata.bbclass (from /home/ttorling/Projects/openembedded-core/meta/classes/package.bbclass:41) +DEBUG: Inheriting /home/ttorling/Projects/openembedded-core/meta/classes/chrpath.bbclass (from /home/ttorling/Projects/openembedded-core/meta/classes/package.bbclass:42) +DEBUG: Inheriting /home/ttorling/Projects/openembedded-core/meta/classes/insane.bbclass (from /home/ttorling/Projects/openembedded-core/meta/classes/package.bbclass:45) +DEBUG: Inheriting /home/ttorling/Projects/openembedded-core/meta/classes/buildstats.bbclass (from configuration INHERITs:0) +DEBUG: Inheriting /home/ttorling/Projects/openembedded-core/meta/classes/image-mklibs.bbclass (from configuration INHERITs:0) +DEBUG: Inheriting /home/ttorling/Projects/openembedded-core/meta/classes/linuxloader.bbclass (from /home/ttorling/Projects/openembedded-core/meta/classes/image-mklibs.bbclass:5) +DEBUG: Inheriting /home/ttorling/Projects/openembedded-core/meta/classes/image-prelink.bbclass (from configuration INHERITs:0) +DEBUG: Inheriting /home/ttorling/Projects/openembedded-core/meta/classes/debian.bbclass (from configuration INHERITs:0) +DEBUG: Inheriting /home/ttorling/Projects/openembedded-core/meta/classes/devshell.bbclass (from configuration INHERITs:0) +DEBUG: Inheriting /home/ttorling/Projects/openembedded-core/meta/classes/sstate.bbclass (from configuration INHERITs:0) +DEBUG: Inheriting /home/ttorling/Projects/openembedded-core/meta/classes/license.bbclass (from configuration INHERITs:0) +DEBUG: Inheriting /home/ttorling/Projects/openembedded-core/meta/classes/remove-libtool.bbclass (from configuration INHERITs:0) +DEBUG: Inheriting /home/ttorling/Projects/openembedded-core/meta/classes/blacklist.bbclass (from configuration INHERITs:0) +DEBUG: Inheriting /home/ttorling/Projects/openembedded-core/meta/classes/sanity.bbclass (from configuration INHERITs:0) +DEBUG: Clearing SRCREV cache due to cache policy of: clear +DEBUG: Using cache in '/var/build/build-timo-perl-5.28.0/cache/local_file_checksum_cache.dat' +DEBUG: Using cache in '/var/build/build-timo-perl-5.28.0/cache/bb_codeparser.dat' +Entering server connection loop +Accepting [] +Connecting Client +Running command ['setFeatures', [2]] +Running command ['updateConfig', {'abort': True, 'force': False, 'invalidate_stamp': None, 'verbose': False, 'debug': 0, 'dry_run': False, 'dump_signatures': [], 'debug_domains': [], 'extra_assume_provided': [], 'profile': False, 'prefile': [], 'postfile': [], 'server_timeout': None}, {'HTTP_PROXY': 'http://proxy-us.intel.com:911/', 'USER': 'ttorling', 'FTP_PROXY': 'http://proxy.jf.intel.com:1080/', 'PWD': '/home/ttorling/Projects/openembedded-core/meta/recipes-devtools/perl/perl', 'HOME': '/home/ttorling', 'BBPATH': '/var/build/build-timo-perl-5.28.0', 'https_proxy': 'https://proxy-us.intel.com:912/', 'http_proxy': 'http://proxy-us.intel.com:911/', 'BB_ENV_EXTRAWHITE': 'ALL_PROXY BBPATH_EXTRA BB_NO_NETWORK BB_NUMBER_THREADS BB_SETSCENE_ENFORCE BB_SRCREV_POLICY DISTRO FTPS_PROXY FTP_PROXY GIT_PROXY_COMMAND HTTPS_PROXY HTTP_PROXY MACHINE NO_PROXY PARALLEL_MAKE SCREENDIR SDKMACHINE SOCKS5_PASSWD SOCKS5_USER SSH_AGENT_PID SSH_AUTH_SOCK STAMPS_DIR TCLIBC TCMODE all_proxy ftp_proxy ftps_proxy http_proxy https_proxy no_proxy ', 'ALL_PROXY': 'socks://proxy-us.intel.com:1080/', 'no_proxy': '*.jf.intel.com,*.ostc.intel.com,*.devtools.intel.com, certificates.intel.com', 'NO_PROXY': '*.jf.intel.com,*.ostc.intel.com,*.devtools.intel.com, certificates.intel.com', 'GIT_PROXY_COMMAND': '/usr/bin/oe-git-proxy', 'HTTPS_PROXY': 'https://proxy-us.intel.com:912/', 'TERM': 'xterm-256color', 'SHELL': '/bin/bash', 'all_proxy': 'socks://proxy-us.intel.com:1080/', 'LOGNAME': 'ttorling', 'PATH': '/home/ttorling/Projects/openembedded-core/scripts:/home/ttorling/Projects/bitbake/bin:/usr/libexec/python3-sphinx:/usr/lib64/ccache:/usr/local/bin:/usr/bin:/usr/local/sbin:/usr/sbin:/home/ttorling/.local/bin:/home/ttorling/bin', 'ftp_proxy': 'http://proxy-us.intel.com:1080/', 'LC_ALL': 'en_US.UTF-8', 'LS_COLORS': 'no=00:fi=00:di=34:ow=34;40:ln=35:pi=30;44:so=35;44:do=35;44:bd=33;44:cd=37;44:or=05;37;41:mi=05;37;41:ex=01;31:*.cmd=01;31:*.exe=01;31:*.com=01;31:*.bat=01;31:*.reg=01;31:*.app=01;31:*.txt=32:*.org=32:*.md=32:*.mkd=32:*.h=32:*.hpp=32:*.c=32:*.C=32:*.cc=32:*.cpp=32:*.cxx=32:*.objc=32:*.cl=32:*.sh=32:*.bash=32:*.csh=32:*.zsh=32:*.el=32:*.vim=32:*.java=32:*.pl=32:*.pm=32:*.py=32:*.rb=32:*.hs=32:*.php=32:*.htm=32:*.html=32:*.shtml=32:*.erb=32:*.haml=32:*.xml=32:*.rdf=32:*.css=32:*.sass=32:*.scss=32:*.less=32:*.js=32:*.coffee=32:*.man=32:*.0=32:*.1=32:*.2=32:*.3=32:*.4=32:*.5=32:*.6=32:*.7=32:*.8=32:*.9=32:*.l=32:*.n=32:*.p=32:*.pod=32:*.tex=32:*.go=32:*.sql=32:*.csv=32:*.bmp=33:*.cgm=33:*.dl=33:*.dvi=33:*.emf=33:*.eps=33:*.gif=33:*.jpeg=33:*.jpg=33:*.JPG=33:*.mng=33:*.pbm=33:*.pcx=33:*.pdf=33:*.pgm=33:*.png=33:*.PNG=33:*.ppm=33:*.pps=33:*.ppsx=33:*.ps=33:*.svg=33:*.svgz=33:*.tga=33:*.tif=33:*.tiff=33:*.xbm=33:*.xcf=33:*.xpm=33:*.xwd=33:*.xwd=33:*.yuv=33:*.aac=33:*.au=33:*.flac=33:*.m4a=33:*.mid=33:*.midi=33:*.mka=33:*.mp3=33:*.mpa=33:*.mpeg=33:*.mpg=33:*.ogg=33:*.opus=33:*.ra=33:*.wav=33:*.anx=33:*.asf=33:*.avi=33:*.axv=33:*.flc=33:*.fli=33:*.flv=33:*.gl=33:*.m2v=33:*.m4v=33:*.mkv=33:*.mov=33:*.MOV=33:*.mp4=33:*.mp4v=33:*.mpeg=33:*.mpg=33:*.nuv=33:*.ogm=33:*.ogv=33:*.ogx=33:*.qt=33:*.rm=33:*.rmvb=33:*.swf=33:*.vob=33:*.webm=33:*.wmv=33:*.doc=31:*.docx=31:*.rtf=31:*.odt=31:*.dot=31:*.dotx=31:*.ott=31:*.xls=31:*.xlsx=31:*.ods=31:*.ots=31:*.ppt=31:*.pptx=31:*.odp=31:*.otp=31:*.fla=31:*.psd=31:*.7z=1;35:*.apk=1;35:*.arj=1;35:*.bin=1;35:*.bz=1;35:*.bz2=1;35:*.cab=1;35:*.deb=1;35:*.dmg=1;35:*.gem=1;35:*.gz=1;35:*.iso=1;35:*.jar=1;35:*.msi=1;35:*.rar=1;35:*.rpm=1;35:*.tar=1;35:*.tbz=1;35:*.tbz2=1;35:*.tgz=1;35:*.tx=1;35:*.war=1;35:*.xpi=1;35:*.xz=1;35:*.z=1;35:*.Z=1;35:*.zip=1;35:*.ANSI-30-black=30:*.ANSI-01;30-brblack=01;30:*.ANSI-31-red=31:*.ANSI-01;31-brred=01;31:*.ANSI-32-green=32:*.ANSI-01;32-brgreen=01;32:*.ANSI-33-yellow=33:*.ANSI-01;33-bryellow=01;33:*.ANSI-34-blue=34:*.ANSI-01;34-brblue=01;34:*.ANSI-35-magenta=35:*.ANSI-01;35-brmagenta=01;35:*.ANSI-36-cyan=36:*.ANSI-01;36-brcyan=01;36:*.ANSI-37-white=37:*.ANSI-01;37-brwhite=01;37:*.log=01;32:*~=01;32:*#=01;32:*.bak=01;33:*.BAK=01;33:*.old=01;33:*.OLD=01;33:*.org_archive=01;33:*.off=01;33:*.OFF=01;33:*.dist=01;33:*.DIST=01;33:*.orig=01;33:*.ORIG=01;33:*.swp=01;33:*.swo=01;33:*,v=01;33:*.gpg=34:*.gpg=34:*.pgp=34:*.asc=34:*.3des=34:*.aes=34:*.enc=34:*.sqlite=34:', 'SSH_CONNECTION': '10.254.107.201 59657 10.54.74.39 22', 'LANG': 'en_US.UTF-8', 'HISTCONTROL': 'ignoredups', 'GUESTFISH_RESTORE': '\\e[0m', 'HOSTNAME': 'chiron.jf.intel.com', 'OLDPWD': '/home/ttorling/Projects/openembedded-core/meta/recipes-devtools/perl/perl/debian', 'GUESTFISH_INIT': '\\e[1;34m', 'XDG_SESSION_ID': '4715', 'GUESTFISH_PS1': '\\[\\e[1;32m\\]>\\[\\e[0;31m\\] ', 'SELINUX_ROLE_REQUESTED': '', 'SSH_CLIENT': '10.254.107.201 59657 22', 'SELINUX_LEVEL_REQUESTED': '', 'XDG_DATA_DIRS': '/home/ttorling/.local/share/flatpak/exports/share:/var/lib/flatpak/exports/share:/usr/local/share:/usr/share', 'LOADEDMODULES': 'python-sphinx/python3-sphinx', 'BUILDDIR': '/var/build/build-timo-perl-5.28.0', 'SSH_TTY': '/dev/pts/5', 'MAIL': '/var/spool/mail/ttorling', 'SOCKS_PROXY': 'socks://proxy-us.intel.com:1080/', 'socks_proxy': 'socks://proxy-us.intel.com:1080/', 'SELINUX_USE_CURRENT_RANGE': '', 'SHLVL': '1', 'MODULEPATH': '/etc/scl/modulefiles:/usr/share/Modules/modulefiles:/etc/modulefiles:/usr/share/modulefiles', 'DBUS_SESSION_BUS_ADDRESS': 'unix:path=/run/user/1000/bus', 'XDG_RUNTIME_DIR': '/run/user/1000', '_LMFILES_': '/usr/share/modulefiles/python-sphinx/python3-sphinx', 'GUESTFISH_OUTPUT': '\\e[0m', 'MODULESHOME': '/usr/share/Modules', 'HISTSIZE': '1000', 'LESSOPEN': '||/usr/bin/lesspipe.sh %s', 'BASH_FUNC_module%%': '() { eval `/usr/bin/modulecmd bash $*`\n}', 'BASH_FUNC_scl%%': '() { if [ "$1" = "load" -o "$1" = "unload" ]; then\n eval "module $@";\n else\n /usr/bin/scl "$@";\n fi\n}', '_': '/home/ttorling/Projects/bitbake/bin/bitbake'}, ['/home/ttorling/Projects/bitbake/bin/bitbake', 'perl-native']] +Running command ['getVariable', 'BBINCLUDELOGS'] +Running command ['getVariable', 'BBINCLUDELOGS_LINES'] +Running command ['getSetVariable', 'BB_CONSOLELOG'] +Running command ['getUIHandlerNum'] +Running command ['setEventMask', 1, 20, {}, ['bb.runqueue.runQueueExitWait', 'bb.event.LogExecTTY', 'logging.LogRecord', 'bb.build.TaskFailed', 'bb.build.TaskBase', 'bb.event.ParseStarted', 'bb.event.ParseProgress', 'bb.event.ParseCompleted', 'bb.event.CacheLoadStarted', 'bb.event.CacheLoadProgress', 'bb.event.CacheLoadCompleted', 'bb.command.CommandFailed', 'bb.command.CommandExit', 'bb.command.CommandCompleted', 'bb.cooker.CookerExit', 'bb.event.MultipleProviders', 'bb.event.NoProvider', 'bb.runqueue.sceneQueueTaskStarted', 'bb.runqueue.runQueueTaskStarted', 'bb.runqueue.runQueueTaskFailed', 'bb.runqueue.sceneQueueTaskFailed', 'bb.event.BuildBase', 'bb.build.TaskStarted', 'bb.build.TaskSucceeded', 'bb.build.TaskFailedSilent', 'bb.build.TaskProgress', 'bb.event.ProcessStarted', 'bb.event.ProcessProgress', 'bb.event.ProcessFinished']] +Running command ['getVariable', 'BB_DEFAULT_TASK'] +Running command ['setConfig', 'cmd', 'build'] +Running command ['buildTargets', ['perl-native'], 'build'] +Connecting Client +Disconnecting Client +No timeout, exiting. +Exiting diff --git a/meta/recipes-devtools/perl/perl/cross-generate_uudmap.patch b/meta/recipes-devtools/perl/perl/cross-generate_uudmap.patch index 33e222259f7..0894214e453 100644 --- a/meta/recipes-devtools/perl/perl/cross-generate_uudmap.patch +++ b/meta/recipes-devtools/perl/perl/cross-generate_uudmap.patch @@ -1,10 +1,19 @@ +From 4ea95a0ffb3d602031f3a4df5beb6589591ca0e7 Mon Sep 17 00:00:00 2001 +From: Nitin A Kamble +Date: Wed, 19 Oct 2011 14:53:17 -0700 +Subject: [PATCH] perl: upgrade from 5.12.3 to 5.14.2 + Upstream-Status:Inappropriate [embedded specific] -Index: perl-5.24.1/Makefile.SH -=================================================================== ---- perl-5.24.1.orig/Makefile.SH -+++ perl-5.24.1/Makefile.SH -@@ -710,7 +710,7 @@ bitcount.h: generate_uudmap\$(HOST_EXE_E +--- + Makefile.SH | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile.SH b/Makefile.SH +index c6aaf02..e7e3324 100755 +--- a/Makefile.SH ++++ b/Makefile.SH +@@ -729,7 +729,7 @@ bitcount.h: generate_uudmap\$(HOST_EXE_EXT) $spitshell >>$Makefile <<'!NO!SUBS!' generate_uudmap$(HOST_EXE_EXT): generate_uudmap$(OBJ_EXT) diff --git a/meta/recipes-devtools/perl/perl/debian/configure-regen.diff b/meta/recipes-devtools/perl/perl/debian/configure-regen.diff new file mode 100644 index 00000000000..8c8332eb59e --- /dev/null +++ b/meta/recipes-devtools/perl/perl/debian/configure-regen.diff @@ -0,0 +1,128 @@ +From c4aff15e74aa3e49190893bd18c8a07221806cd3 Mon Sep 17 00:00:00 2001 +From: Niko Tyni +Date: Sat, 14 Oct 2017 17:47:09 +0300 +Subject: Regenerate Configure et al. after probe unit changes + +The config_h.SH reordering seems unavoidable but one time only, and also +propagates to uconfig.h. + +Patch-Name: debian/configure-regen.diff +Bug-Debian: https://bugs.debian.org/762638 +--- + Configure | 14 ++++++++++---- + config_h.SH | 14 +++++++------- + uconfig.h | 16 ++++++++-------- + 3 files changed, 25 insertions(+), 19 deletions(-) + +diff --git a/Configure b/Configure +index bdcfaf17ef..47e2d3d4ed 100755 +--- a/Configure ++++ b/Configure +@@ -1497,8 +1497,7 @@ archname='' + usereentrant='undef' + : List of libraries we want. + : If anyone needs extra -lxxx, put those in a hint file. +-libswanted="cl pthread socket bind inet nsl ndbm gdbm dbm db malloc dl ld" +-libswanted="$libswanted sun m crypt sec util c cposix posix ucb bsd BSD" ++libswanted='gdbm gdbm_compat db dl m c crypt' + : We probably want to search /usr/shlib before most other libraries. + : This is only used by the lib/ExtUtils/MakeMaker.pm routine extliblist. + glibpth=`echo " $glibpth " | sed -e 's! /usr/shlib ! !'` +@@ -11127,8 +11126,15 @@ $cat >attrib.c < + #endif ++#$i_inttypes I_INTTYPES ++#ifdef I_INTTYPES ++#include ++#endif ++#ifndef INTPTR_MAX ++#define intptr_t int ++#endif + int null_printf (char* pat,...) __attribute__((__format__(__printf__,1,2))); +-int null_printf (char* pat,...) { return (int)pat; } ++int null_printf (char* pat,...) { return (int)(intptr_t)pat; } + int main () { exit(null_printf(NULL)); } + EOCP + if $cc $ccflags -o attrib attrib.c >attrib.out 2>&1 ; then +@@ -24254,7 +24260,7 @@ sunos*X4*) + ;; + *) case "$usedl" in + $define|true|[yY]*) +- set X `echo " $libs " | sed -e 's@ -lndbm @ @' -e 's@ -lgdbm @ @' -e 's@ -lgdbm_compat @ @' -e 's@ -ldbm @ @' -e 's@ -ldb @ @'` ++ set X `echo " $libs " | sed -e 's@ -lgdbm @ @' -e 's@ -lgdbm_compat @ @' -e 's@ -ldb @ @'` + shift + perllibs="$*" + ;; +diff --git a/config_h.SH b/config_h.SH +index e9b144f02b..a294c29cb0 100755 +--- a/config_h.SH ++++ b/config_h.SH +@@ -571,6 +571,13 @@ sed <$CONFIG_H -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un + */ + #$d_strcoll HAS_STRCOLL /**/ + ++/* USE_STRUCT_COPY: ++ * This symbol, if defined, indicates that this C compiler knows how ++ * to copy structures. If undefined, you'll need to use a block copy ++ * routine of some sort instead. ++ */ ++#$d_strctcpy USE_STRUCT_COPY /**/ ++ + /* HAS_STRTOD: + * This symbol, if defined, indicates that the strtod routine is + * available to provide better numeric string conversion than atof(). +@@ -2175,13 +2182,6 @@ sed <$CONFIG_H -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un + #$d_statblks USE_STAT_BLOCKS /**/ + #endif + +-/* USE_STRUCT_COPY: +- * This symbol, if defined, indicates that this C compiler knows how +- * to copy structures. If undefined, you'll need to use a block copy +- * routine of some sort instead. +- */ +-#$d_strctcpy USE_STRUCT_COPY /**/ +- + /* HAS_STRERROR: + * This symbol, if defined, indicates that the strerror routine is + * available to translate error numbers to strings. See the writeup +diff --git a/uconfig.h b/uconfig.h +index 6832f6f73d..a5cd2dd44e 100644 +--- a/uconfig.h ++++ b/uconfig.h +@@ -536,6 +536,13 @@ + */ + /*#define HAS_STRCOLL / **/ + ++/* USE_STRUCT_COPY: ++ * This symbol, if defined, indicates that this C compiler knows how ++ * to copy structures. If undefined, you'll need to use a block copy ++ * routine of some sort instead. ++ */ ++/*#define USE_STRUCT_COPY / **/ ++ + /* HAS_STRTOD: + * This symbol, if defined, indicates that the strtod routine is + * available to provide better numeric string conversion than atof(). +@@ -2140,13 +2147,6 @@ + /*#define USE_STAT_BLOCKS / **/ + #endif + +-/* USE_STRUCT_COPY: +- * This symbol, if defined, indicates that this C compiler knows how +- * to copy structures. If undefined, you'll need to use a block copy +- * routine of some sort instead. +- */ +-/*#define USE_STRUCT_COPY / **/ +- + /* HAS_STRERROR: + * This symbol, if defined, indicates that the strerror routine is + * available to translate error numbers to strings. See the writeup +@@ -5354,6 +5354,6 @@ + #endif + + /* Generated from: +- * a0cea6273c16c1c5d8625665c84bda01926ce960c26873d4e5596b5b02a53e92 config_h.SH ++ * 28ca1428da5d95db9e1c446562e21f67c6f2d4094eed684418c6854460c8a926 config_h.SH + * b1c042726e6a17692921b6947c4e7c196c5c0cee011667ba719b15af7c31e669 uconfig.sh + * ex: set ro: */ diff --git a/meta/recipes-devtools/perl/perl/debian/cpan-missing-site-dirs.diff b/meta/recipes-devtools/perl/perl/debian/cpan-missing-site-dirs.diff index c597701cad5..e21e9b7d513 100644 --- a/meta/recipes-devtools/perl/perl/debian/cpan-missing-site-dirs.diff +++ b/meta/recipes-devtools/perl/perl/debian/cpan-missing-site-dirs.diff @@ -1,8 +1,8 @@ -From d33d46963035ef726144dc66be2ae9c00aec0333 Mon Sep 17 00:00:00 2001 +From f78d2c2b3f3db6bcdcaca696abd800759740812b Mon Sep 17 00:00:00 2001 From: Niko Tyni Date: Tue, 16 Oct 2012 23:07:56 +0300 -Subject: Fix CPAN::FirstTime defaults with nonexisting site dirs if a parent - is writable +Subject: [PATCH] Fix CPAN::FirstTime defaults with nonexisting site dirs if a + parent is writable The site directories do not exist on a typical Debian system. The build systems will create them when necessary, so there's no need for a prompt @@ -13,16 +13,16 @@ explicitly tell CPAN not to touch those with INSTALLDIRS=site. Bug-Debian: http://bugs.debian.org/688842 Patch-Name: debian/cpan-missing-site-dirs.diff -Upstream-Status: Pending + --- cpan/CPAN/lib/CPAN/FirstTime.pm | 31 +++++++++++++++++++++++++++---- 1 file changed, 27 insertions(+), 4 deletions(-) diff --git a/cpan/CPAN/lib/CPAN/FirstTime.pm b/cpan/CPAN/lib/CPAN/FirstTime.pm -index 33054cd..7b0becf 100644 +index 3ccaeec..05d8910 100644 --- a/cpan/CPAN/lib/CPAN/FirstTime.pm +++ b/cpan/CPAN/lib/CPAN/FirstTime.pm -@@ -2057,11 +2057,34 @@ sub _print_urllist { +@@ -2067,11 +2067,34 @@ sub _print_urllist { }; } diff --git a/meta/recipes-devtools/perl/perl/debian/cpan_definstalldirs.diff b/meta/recipes-devtools/perl/perl/debian/cpan_definstalldirs.diff index 572f1495142..2ceb6e762bd 100644 --- a/meta/recipes-devtools/perl/perl/debian/cpan_definstalldirs.diff +++ b/meta/recipes-devtools/perl/perl/debian/cpan_definstalldirs.diff @@ -1,24 +1,24 @@ -From 5ff1f21484aab68efe321ff4ba5d35928f72af96 Mon Sep 17 00:00:00 2001 +From bff3929ba9f07af375c9387c6ebb8d0a37f63cdb Mon Sep 17 00:00:00 2001 From: Brendan O'Dea Date: Tue, 8 Mar 2005 19:30:38 +1100 -Subject: Provide a sensible INSTALLDIRS default for modules installed from - CPAN. +Subject: [PATCH] Provide a sensible INSTALLDIRS default for modules installed + from CPAN. Some modules which are included in core set INSTALLDIRS => 'perl' explicitly in Makefile.PL or Build.PL. This makes sense for the normal @INC ordering, but not ours. Patch-Name: debian/cpan_definstalldirs.diff -Upstream-Status: Pending + --- cpan/CPAN/lib/CPAN/FirstTime.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cpan/CPAN/lib/CPAN/FirstTime.pm b/cpan/CPAN/lib/CPAN/FirstTime.pm -index 918e009..33054cd 100644 +index 531c115..3ccaeec 100644 --- a/cpan/CPAN/lib/CPAN/FirstTime.pm +++ b/cpan/CPAN/lib/CPAN/FirstTime.pm -@@ -1024,7 +1024,7 @@ sub init { +@@ -1033,7 +1033,7 @@ sub init { my_prompt_loop(prefer_installer => 'MB', $matcher, 'MB|EUMM|RAND'); if (!$matcher or 'makepl_arg make_arg' =~ /$matcher/) { @@ -27,7 +27,7 @@ index 918e009..33054cd 100644 my_dflt_prompt(make_arg => "", $matcher); if ( $CPAN::Config->{makepl_arg} =~ /LIBS=|INC=/ ) { $CPAN::Frontend->mywarn( -@@ -1056,7 +1056,7 @@ sub init { +@@ -1065,7 +1065,7 @@ sub init { my_dflt_prompt(make_install_arg => $CPAN::Config->{make_arg} || "", $matcher); diff --git a/meta/recipes-devtools/perl/perl/debian/db_file_ver.diff b/meta/recipes-devtools/perl/perl/debian/db_file_ver.diff index 0861650eb6b..d40af198982 100644 --- a/meta/recipes-devtools/perl/perl/debian/db_file_ver.diff +++ b/meta/recipes-devtools/perl/perl/debian/db_file_ver.diff @@ -1,14 +1,14 @@ -From 01421f8a80d5c623959695ba2b8167f30112d333 Mon Sep 17 00:00:00 2001 +From 2d2d34408d389fa9bf2047611dac19fa26b229ea Mon Sep 17 00:00:00 2001 From: Brendan O'Dea Date: Fri, 16 Dec 2005 01:32:14 +1100 -Subject: Remove overly restrictive DB_File version check. +Subject: [PATCH] Remove overly restrictive DB_File version check. Bug-Debian: http://bugs.debian.org/340047 Package dependencies ensure the correct library is linked at run-time. Patch-Name: debian/db_file_ver.diff -Upstream-Status: Pending + --- cpan/DB_File/version.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-devtools/perl/perl/debian/deprecate-with-apt.diff b/meta/recipes-devtools/perl/perl/debian/deprecate-with-apt.diff index c2ac4a3bdfe..8af38af4e31 100644 --- a/meta/recipes-devtools/perl/perl/debian/deprecate-with-apt.diff +++ b/meta/recipes-devtools/perl/perl/debian/deprecate-with-apt.diff @@ -1,7 +1,7 @@ -From def4aa3817f98aae625e601b791ef068276f05d5 Mon Sep 17 00:00:00 2001 +From 30e7d8d6deee25eaa998523b91b87ae769babd87 Mon Sep 17 00:00:00 2001 From: Dominic Hargreaves Date: Mon, 17 May 2010 13:23:07 +0300 -Subject: Point users to Debian packages of deprecated core modules +Subject: [PATCH] Point users to Debian packages of deprecated core modules Bug-Debian: http://bugs.debian.org/747628 @@ -15,7 +15,7 @@ warnings will still be useful, so modify them slightly to point to the separate packages instead. Patch-Name: debian/deprecate-with-apt.diff -Upstream-Status: Pending + --- lib/deprecate.pm | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/meta/recipes-devtools/perl/perl/debian/doc_info.diff b/meta/recipes-devtools/perl/perl/debian/doc_info.diff index 4662ecdaa7b..1ae394e1333 100644 --- a/meta/recipes-devtools/perl/perl/debian/doc_info.diff +++ b/meta/recipes-devtools/perl/perl/debian/doc_info.diff @@ -1,21 +1,22 @@ -From e18f81e69c55d698abd293e71063d6b6b275cc07 Mon Sep 17 00:00:00 2001 +From 4ae088472565a6a1a8792f923c6600705edde6e3 Mon Sep 17 00:00:00 2001 From: Brendan O'Dea Date: Fri, 18 Mar 2005 22:22:25 +1100 -Subject: Replace generic man(1) instructions with Debian-specific information. +Subject: [PATCH] Replace generic man(1) instructions with Debian-specific + information. Indicate that the user needs to install the perl-doc package. Patch-Name: debian/doc_info.diff -Upstream-Status: Pending + --- pod/perl.pod | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pod/perl.pod b/pod/perl.pod -index 364e957..f97e103 100644 +index 4e4661e..d21cfe9 100644 --- a/pod/perl.pod +++ b/pod/perl.pod -@@ -291,8 +291,16 @@ aux c2ph h2ph h2xs perlbug pl2pm pod2html pod2man splain xsubpp +@@ -292,8 +292,16 @@ aux h2ph h2xs perlbug pl2pm pod2html pod2man splain xsubpp =for buildtoc __END__ diff --git a/meta/recipes-devtools/perl/perl/debian/enc2xs_inc.diff b/meta/recipes-devtools/perl/perl/debian/enc2xs_inc.diff index b3bd58c1d10..0bbc47f7ca7 100644 --- a/meta/recipes-devtools/perl/perl/debian/enc2xs_inc.diff +++ b/meta/recipes-devtools/perl/perl/debian/enc2xs_inc.diff @@ -1,7 +1,8 @@ -From 7fe59a3d0601c6d8634eae4f99dae3024cd02a92 Mon Sep 17 00:00:00 2001 +From 78240dfe28febc268010675de335d1bdafd9a303 Mon Sep 17 00:00:00 2001 From: Brendan O'Dea Date: Tue, 8 Mar 2005 19:30:38 +1100 -Subject: Tweak enc2xs to follow symlinks and ignore missing @INC directories. +Subject: [PATCH] Tweak enc2xs to follow symlinks and ignore missing @INC + directories. Bug-Debian: http://bugs.debian.org/290336 @@ -11,17 +12,17 @@ Bug-Debian: http://bugs.debian.org/290336 issues with follow => 1 (see #603686 and [rt.cpan.org #64585]) Patch-Name: debian/enc2xs_inc.diff -Upstream-Status: Pending + --- cpan/Encode/bin/enc2xs | 8 ++++---- t/porting/customized.t | 3 +++ 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/cpan/Encode/bin/enc2xs b/cpan/Encode/bin/enc2xs -index 19f2b2b..4d64e38 100644 +index bd39639..e467518 100644 --- a/cpan/Encode/bin/enc2xs +++ b/cpan/Encode/bin/enc2xs -@@ -944,11 +944,11 @@ use vars qw( +@@ -1013,11 +1013,11 @@ use vars qw( sub find_e2x{ eval { require File::Find; }; my (@inc, %e2x_dir); @@ -35,7 +36,7 @@ index 19f2b2b..4d64e38 100644 my ($dev,$ino,$mode,$nlink,$uid,$gid,$rdev,$size, $atime,$mtime,$ctime,$blksize,$blocks) = lstat($_) or return; -@@ -958,7 +958,7 @@ sub find_e2x{ +@@ -1027,7 +1027,7 @@ sub find_e2x{ $e2x_dir{$File::Find::dir} ||= $mtime; } return; @@ -44,7 +45,7 @@ index 19f2b2b..4d64e38 100644 warn join("\n", keys %e2x_dir), "\n"; for my $d (sort {$e2x_dir{$a} <=> $e2x_dir{$b}} keys %e2x_dir){ $_E2X = $d; -@@ -1025,7 +1025,7 @@ sub make_configlocal_pm { +@@ -1094,7 +1094,7 @@ sub make_configlocal_pm { $LocalMod{$enc} ||= $mod; } }; diff --git a/meta/recipes-devtools/perl/perl/debian/errno_ver.diff b/meta/recipes-devtools/perl/perl/debian/errno_ver.diff index a965fbeeecf..1c7e9c194c6 100644 --- a/meta/recipes-devtools/perl/perl/debian/errno_ver.diff +++ b/meta/recipes-devtools/perl/perl/debian/errno_ver.diff @@ -1,7 +1,7 @@ -From 8e1efba7560d8d55524c7a0f1b0539ddce419b86 Mon Sep 17 00:00:00 2001 +From e055c5df42111f672a66f314a86d0068a24c070c Mon Sep 17 00:00:00 2001 From: Brendan O'Dea Date: Fri, 16 Dec 2005 01:32:14 +1100 -Subject: [PATCH 6/8] Remove Errno version check due to upgrade problems with +Subject: [PATCH] Remove Errno version check due to upgrade problems with long-running processes. Bug-Debian: http://bugs.debian.org/343351 @@ -11,27 +11,35 @@ processes embedding perl when upgrading to a newer version, compatible, but built on a different machine. Patch-Name: debian/errno_ver.diff -Upstream-Status: Pending + --- - ext/Errno/Errno_pm.PL | 5 ----- - 1 file changed, 5 deletions(-) + ext/Errno/Errno_pm.PL | 16 ---------------- + 1 file changed, 16 deletions(-) diff --git a/ext/Errno/Errno_pm.PL b/ext/Errno/Errno_pm.PL -index 6251a3c..eeed445 100644 +index d345e98..4464706 100644 --- a/ext/Errno/Errno_pm.PL +++ b/ext/Errno/Errno_pm.PL -@@ -294,11 +294,6 @@ EDQ - # they've already declared perl doesn't need to worry about this risk. - if(!$ENV{'PERL_BUILD_EXPAND_CONFIG_VARS'}) { - print <<"CONFIG_CHECK_END"; +@@ -288,22 +288,6 @@ package Errno; + require Exporter; + use strict; + +-EDQ +- +- # Errno only needs Config to make sure it hasn't changed platforms. +- # If someone set $ENV{PERL_BUILD_EXPAND_CONFIG_VARS} at build time, +- # they've already declared perl doesn't need to worry about this risk. +- if(!$ENV{'PERL_BUILD_EXPAND_CONFIG_VARS'}) { +- print <<"CONFIG_CHECK_END"; -use Config; -"\$Config{'archname'}-\$Config{'osvers'}" eq -"$archname-$Config{'osvers'}" or - die "Errno architecture ($archname-$Config{'osvers'}) does not match executable architecture (\$Config{'archname'}-\$Config{'osvers'})"; - - CONFIG_CHECK_END - } - --- -2.1.4 - +-CONFIG_CHECK_END +-} +- +- print <<"EDQ"; + our \$VERSION = "$VERSION"; + \$VERSION = eval \$VERSION; + our \@ISA = 'Exporter'; diff --git a/meta/recipes-devtools/perl/perl/debian/extutils_set_libperl_path.diff b/meta/recipes-devtools/perl/perl/debian/extutils_set_libperl_path.diff index e023038f048..607a2d8d06a 100644 --- a/meta/recipes-devtools/perl/perl/debian/extutils_set_libperl_path.diff +++ b/meta/recipes-devtools/perl/perl/debian/extutils_set_libperl_path.diff @@ -1,23 +1,22 @@ -From 431275078b0490d2e092442d9582be06bb95b354 Mon Sep 17 00:00:00 2001 +From cef4125d1c553d7cb3ce9589f9c89f7171281b30 Mon Sep 17 00:00:00 2001 From: Niko Tyni Date: Sat, 10 May 2014 23:34:14 +0300 -Subject: EU:MM: set location of libperl.a under /usr/lib +Subject: [PATCH] EU:MM: set location of libperl.a under /usr/lib The Debian packaging moves libperl.a a couple of levels up from the CORE directory to match other static libraries. Patch-Name: debian/extutils_set_libperl_path.diff -Upstream-Status: Pending + --- cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm | 2 +- - pp.c | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm -index 5f1b87f..570a631 100644 +index 66a24d7..3fe8dc2 100644 --- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm +++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm -@@ -2505,7 +2505,7 @@ MAP_PRELIBS = $Config{perllibs} $Config{cryptlib} +@@ -2613,7 +2613,7 @@ MAP_PRELIBS = $Config{perllibs} $Config{cryptlib} ($lperl = $libperl) =~ s/\$\(A\)/$self->{LIB_EXT}/; } unless ($libperl && -f $lperl) { # Ilya's code... @@ -26,13 +25,3 @@ index 5f1b87f..570a631 100644 $dir = "$self->{PERL_ARCHLIB}/.." if $self->{UNINSTALLED_PERL}; $libperl ||= "libperl$self->{LIB_EXT}"; $libperl = "$dir/$libperl"; -diff --git a/pp.c b/pp.c -index 42f156a..77c1279 100644 ---- a/pp.c -+++ b/pp.c -@@ -1,4 +1,4 @@ --/* pp.c -+ /* pp.c - * - * Copyright (C) 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, - * 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 by Larry Wall and others diff --git a/meta/recipes-devtools/perl/perl/debian/fakeroot.diff b/meta/recipes-devtools/perl/perl/debian/fakeroot.diff index bdf34d18596..d05baa28f9f 100644 --- a/meta/recipes-devtools/perl/perl/debian/fakeroot.diff +++ b/meta/recipes-devtools/perl/perl/debian/fakeroot.diff @@ -1,7 +1,7 @@ -From 27ae7b18078d801a2c943aa6de2f7e9808177251 Mon Sep 17 00:00:00 2001 +From b451ca3a34e76b69e791e1d5cd1621edb0496e0d Mon Sep 17 00:00:00 2001 From: Brendan O'Dea Date: Fri, 18 Mar 2005 22:22:25 +1100 -Subject: Postpone LD_LIBRARY_PATH evaluation to the binary targets. +Subject: [PATCH] Postpone LD_LIBRARY_PATH evaluation to the binary targets. Modify the setting of LD_LIBRARY_PATH to append pre-existing values at the time the rule is evaluated rather than when the Makefile is created. @@ -11,16 +11,16 @@ since fakeroot (which now sets LD_LIBRARY_PATH) is not used for the "build" rule where the Makefile is created, but is for the clean/binary* targets. Patch-Name: debian/fakeroot.diff -Upstream-Status: Pending + --- Makefile.SH | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/Makefile.SH b/Makefile.SH -index 034d812..04dd7d5 100755 +index 260d04e..c6aaf02 100755 --- a/Makefile.SH +++ b/Makefile.SH -@@ -39,10 +39,7 @@ case "$useshrplib" in +@@ -48,10 +48,7 @@ case "$useshrplib" in true) # Prefix all runs of 'miniperl' and 'perl' with # $ldlibpth so that ./perl finds *this* shared libperl. @@ -32,7 +32,7 @@ index 034d812..04dd7d5 100755 pldlflags="$cccdlflags" static_ldflags='' -@@ -113,7 +110,7 @@ true) +@@ -122,7 +119,7 @@ true) ;; esac case "$ldlibpthname" in diff --git a/meta/recipes-devtools/perl/perl/debian/find_html2text.diff b/meta/recipes-devtools/perl/perl/debian/find_html2text.diff index 082709140d2..34ed6b4d18b 100644 --- a/meta/recipes-devtools/perl/perl/debian/find_html2text.diff +++ b/meta/recipes-devtools/perl/perl/debian/find_html2text.diff @@ -1,7 +1,7 @@ -From c81dbdedff9e9b4fb75ac028aa718838c0292d2f Mon Sep 17 00:00:00 2001 +From 21186d6d1fa87b0e5c9513aaaf7536769965c50b Mon Sep 17 00:00:00 2001 From: Andreas Marschke Date: Sat, 17 Sep 2011 11:38:42 +0100 -Subject: Configure CPAN::Distribution with correct name of html2text +Subject: [PATCH] Configure CPAN::Distribution with correct name of html2text Bug-Debian: http://bugs.debian.org/640479 Patch-Name: debian/find_html2text.diff @@ -16,16 +16,16 @@ Please see the attached patch for a quick fix of this issue. [Maintainer's note: html2text in Debian is not the same implementation as the html2text.pl which is expected, but should provide similar functionality]. -Upstream-Status: Pending + --- cpan/CPAN/lib/CPAN/Distribution.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cpan/CPAN/lib/CPAN/Distribution.pm b/cpan/CPAN/lib/CPAN/Distribution.pm -index 092b781..5c2bae1 100644 +index 64976eb..aef3070 100644 --- a/cpan/CPAN/lib/CPAN/Distribution.pm +++ b/cpan/CPAN/lib/CPAN/Distribution.pm -@@ -4099,7 +4099,7 @@ sub _display_url { +@@ -4098,7 +4098,7 @@ sub _display_url { if $CPAN::DEBUG; # should we define it in the config instead? diff --git a/meta/recipes-devtools/perl/perl/debian/fixes/net_smtp_docs.diff b/meta/recipes-devtools/perl/perl/debian/fixes/net_smtp_docs.diff deleted file mode 100644 index afcf7fb0128..00000000000 --- a/meta/recipes-devtools/perl/perl/debian/fixes/net_smtp_docs.diff +++ /dev/null @@ -1,26 +0,0 @@ -From fa085fedd9c406edcd4a1a256c025d5ff7f6c6de Mon Sep 17 00:00:00 2001 -From: Brendan O'Dea -Date: Thu, 20 Sep 2007 19:47:14 +1000 -Subject: Document the Net::SMTP 'Port' option - -Bug-Debian: http://bugs.debian.org/100195 -Bug: http://rt.cpan.org/Public/Bug/Display.html?id=36038 - -Patch-Name: fixes/net_smtp_docs.diff -Upstream-Status: Pending ---- - cpan/libnet/lib/Net/SMTP.pm | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/cpan/libnet/lib/Net/SMTP.pm b/cpan/libnet/lib/Net/SMTP.pm -index afd017a..6ae7d9e 100644 ---- a/cpan/libnet/lib/Net/SMTP.pm -+++ b/cpan/libnet/lib/Net/SMTP.pm -@@ -738,6 +738,7 @@ Net::SMTP will attempt to extract the address from the value passed. - - B - Enable debugging information - -+B - Select a port on the remote host to connect to (default is 25) - - Example: - diff --git a/meta/recipes-devtools/perl/perl/debian/fixes/perl-Cnn.diff b/meta/recipes-devtools/perl/perl/debian/fixes/perl-Cnn.diff deleted file mode 100644 index 9bdf41b47d6..00000000000 --- a/meta/recipes-devtools/perl/perl/debian/fixes/perl-Cnn.diff +++ /dev/null @@ -1,74 +0,0 @@ -From 0ecf83f259db09cb38cb37c9b22e72be185afa8f Mon Sep 17 00:00:00 2001 -From: Hugo van der Sanden -Date: Thu, 11 Jun 2015 12:25:40 +0100 -Subject: fix -Cnn parsing - -Commit 22ff313068 for [perl #123814] inadvertently changed the logic when -parsing a numeric parameter to the -C option, such that the successfully -parsed number was not saved as the option value if it parsed to the end -of the argument. - -Bug: https://rt.perl.org/Ticket/Display.html?id=125381 -Bug-Debian: https://bugs.debian.org/788636 -Origin: upstream, http://perl5.git.perl.org/perl.git/commit/89d84ff965 -Patch-Name: fixes/perl-Cnn.diff -Upstream-Status: Pending ---- - t/run/switchC.t | 7 ++++++- - util.c | 17 ++++++++--------- - 2 files changed, 14 insertions(+), 10 deletions(-) - -diff --git a/t/run/switchC.t b/t/run/switchC.t -index f6aa868..4f63c3b 100644 ---- a/t/run/switchC.t -+++ b/t/run/switchC.t -@@ -11,7 +11,7 @@ BEGIN { - skip_all_if_miniperl('-C and $ENV{PERL_UNICODE} are disabled on miniperl'); - } - --plan(tests => 13); -+plan(tests => 14); - - my $r; - -@@ -25,6 +25,11 @@ $r = runperl( switches => [ '-CO', '-w' ], - stderr => 1 ); - like( $r, qr/^$b(?:\r?\n)?$/s, '-CO: no warning on UTF-8 output' ); - -+$r = runperl( switches => [ '-C2', '-w' ], -+ prog => 'print chr(256)', -+ stderr => 1 ); -+like( $r, qr/^$b(?:\r?\n)?$/s, '-C2: no warning on UTF-8 output' ); -+ - SKIP: { - if (exists $ENV{PERL_UNICODE} && - ($ENV{PERL_UNICODE} eq "" || $ENV{PERL_UNICODE} =~ /[SO]/)) { -diff --git a/util.c b/util.c -index 8cf62f5..ee23314 100644 ---- a/util.c -+++ b/util.c -@@ -4420,16 +4420,15 @@ Perl_parse_unicode_opts(pTHX_ const char **popt) - if (isDIGIT(*p)) { - const char* endptr; - UV uv; -- if (grok_atoUV(p, &uv, &endptr) -- && uv <= U32_MAX -- && (p = endptr) -- && *p && *p != '\n' && *p != '\r' -- ) { -+ if (grok_atoUV(p, &uv, &endptr) && uv <= U32_MAX) { - opt = (U32)uv; -- if (isSPACE(*p)) -- goto the_end_of_the_opts_parser; -- else -- Perl_croak(aTHX_ "Unknown Unicode option letter '%c'", *p); -+ p = endptr; -+ if (p && *p && *p != '\n' && *p != '\r') { -+ if (isSPACE(*p)) -+ goto the_end_of_the_opts_parser; -+ else -+ Perl_croak(aTHX_ "Unknown Unicode option letter '%c'", *p); -+ } - } - } - else { diff --git a/meta/recipes-devtools/perl/perl/debian/fixes/pod_man_reproducible_date.diff b/meta/recipes-devtools/perl/perl/debian/fixes/pod_man_reproducible_date.diff deleted file mode 100644 index d23573f188a..00000000000 --- a/meta/recipes-devtools/perl/perl/debian/fixes/pod_man_reproducible_date.diff +++ /dev/null @@ -1,171 +0,0 @@ -From 9057adc106d6bbef53c9e706523cd94f1a7a08d4 Mon Sep 17 00:00:00 2001 -From: Russ Allbery -Date: Sat, 30 Aug 2014 15:10:41 -0700 -Subject: Support POD_MAN_DATE in Pod::Man for the left-hand footer - -Honor the environment variable POD_MAN_DATE and use its contents, if -set, as the value of the left-hand footer if the date option is not -set, overriding the timestamp of the input file. This is primarily -useful to ensure reproducible builds of the same output file given the -same souce and Pod::Man version, even when file timestamps may not be -consistent. Thanks, Niko Tyni. - -Bug-Debian: http://bugs.debian.org/759405 -Origin: upstream -Patch-Name: fixes/pod_man_reproducible_date.diff -Upstream-Status: Pending ---- - cpan/podlators/lib/Pod/Man.pm | 69 +++++++++++++++++++++++++++++++----------- - cpan/podlators/t/devise-date.t | 29 +++++++++++++----- - 2 files changed, 72 insertions(+), 26 deletions(-) - -diff --git a/cpan/podlators/lib/Pod/Man.pm b/cpan/podlators/lib/Pod/Man.pm -index 72ca9ff..0536662 100644 ---- a/cpan/podlators/lib/Pod/Man.pm -+++ b/cpan/podlators/lib/Pod/Man.pm -@@ -876,25 +876,42 @@ sub devise_title { - } - - # Determine the modification date and return that, properly formatted in ISO --# format. If we can't get the modification date of the input, instead use the --# current time. Pod::Simple returns a completely unuseful stringified file --# handle as the source_filename for input from a file handle, so we have to --# deal with that as well. -+# format. -+# -+# If POD_MAN_DATE is set, that overrides anything else. This can be used for -+# reproducible generation of the same file even if the input file timestamps -+# are unpredictable or the POD coms from standard input. -+# -+# Otherwise, use the modification date of the input if we can stat it. Be -+# aware that Pod::Simple returns the stringification of the file handle as -+# source_filename for input from a file handle, so we'll stat some random ref -+# string in that case. If that fails, instead use the current time. -+# -+# $self - Pod::Man object, used to get the source file -+# -+# Returns: YYYY-MM-DD date suitable for the left-hand footer - sub devise_date { - my ($self) = @_; -+ -+ # If POD_MAN_DATE is set, always use it. -+ if ($ENV{POD_MAN_DATE}) { -+ return $ENV{POD_MAN_DATE}; -+ } -+ -+ # Otherwise, get the input filename and try to stat it. If that fails, -+ # use the current time. - my $input = $self->source_filename; - my $time; - if ($input) { -- $time = (stat $input)[9] || time; -+ $time = (stat($input))[9] || time(); - } else { -- $time = time; -+ $time = time(); - } - -- # Can't use POSIX::strftime(), which uses Fcntl, because MakeMaker -- # uses this and it has to work in the core which can't load dynamic -- # libraries. -- my ($year, $month, $day) = (localtime $time)[5,4,3]; -- return sprintf ("%04d-%02d-%02d", $year + 1900, $month + 1, $day); -+ # Can't use POSIX::strftime(), which uses Fcntl, because MakeMaker uses -+ # this and it has to work in the core which can't load dynamic libraries. -+ my ($year, $month, $day) = (localtime($time))[5,4,3]; -+ return sprintf("%04d-%02d-%02d", $year + 1900, $month + 1, $day); - } - - # Print out the preamble and the title. The meaning of the arguments to .TH -@@ -1632,6 +1649,15 @@ argument. - Sets the centered page header to use instead of "User Contributed Perl - Documentation". - -+=item date -+ -+Sets the left-hand footer. If this option is not set, the contents of the -+environment variable POD_MAN_DATE, if set, will be used. Failing that, -+the modification date of the input file will be used, or the current time -+if stat() can't find that file (which will be the case if the input is -+from C). If obtained from the file modification date or the -+current time, he date will be formatted as C. -+ - =item errors - - How to report errors. C says to throw an exception on any POD -@@ -1642,13 +1668,6 @@ POD errors entirely, as much as possible. - - The default is C. - --=item date -- --Sets the left-hand footer. By default, the modification date of the input --file will be used, or the current date if stat() can't find that file (the --case if the input is from C), and the date will be formatted as --C. -- - =item fixed - - The fixed-width font to use for verbatim text and code. Defaults to -@@ -1810,6 +1829,20 @@ option was set to C. - - =back - -+=head1 ENVIRONMENT -+ -+=over 4 -+ -+=item POD_MAN_DATE -+ -+If set, this will be used as the value of the left-hand footer unless the -+C option is explicitly set, overriding the timestamp of the input -+file or the current time. This is primarily useful to ensure reproducible -+builds of the same output file given the same souce and Pod::Man version, -+even when file timestamps may not be consistent. -+ -+=back -+ - =head1 BUGS - - Encoding handling assumes that PerlIO is available and does not work -diff --git a/cpan/podlators/t/devise-date.t b/cpan/podlators/t/devise-date.t -index 3cce9f5..c610dd9 100644 ---- a/cpan/podlators/t/devise-date.t -+++ b/cpan/podlators/t/devise-date.t -@@ -1,15 +1,28 @@ --#!/usr/bin/perl -w -- --# In order for MakeMaker to build in the core, nothing can use --# Fcntl which includes POSIX. devise_date()'s use of strftime() --# was replaced. This tests that it's identical. -+#!/usr/bin/perl -+# -+# In order for MakeMaker to build in the core, nothing can use Fcntl which -+# includes POSIX. devise_date()'s use of strftime() was replaced. This tests -+# that it's identical. It also tests special handling of the POD_MAN_DATE -+# environment variable. - -+use 5.006; - use strict; -- --use Test::More tests => 1; -+use warnings; - - use Pod::Man; - use POSIX qw(strftime); - -+use Test::More tests => 2; -+ -+# Check that the results of device_date matches strftime. There is no input -+# file name, so this will use the current time. - my $parser = Pod::Man->new; --is $parser->devise_date, strftime("%Y-%m-%d", localtime); -+is( -+ $parser->devise_date, -+ strftime('%Y-%m-%d', localtime()), -+ 'devise_date matches strftime' -+); -+ -+# Set the override environment variable and ensure that it's honored. -+local $ENV{POD_MAN_DATE} = '2014-01-01'; -+is($parser->devise_date, '2014-01-01', 'devise_date honors POD_MAN_DATE'); diff --git a/meta/recipes-devtools/perl/perl/debian/fixes/podman-empty-date.diff b/meta/recipes-devtools/perl/perl/debian/fixes/podman-empty-date.diff deleted file mode 100644 index 9de29b86542..00000000000 --- a/meta/recipes-devtools/perl/perl/debian/fixes/podman-empty-date.diff +++ /dev/null @@ -1,52 +0,0 @@ -From 183bb4af7ad862a2cf31d0dcb3dd45c100f76776 Mon Sep 17 00:00:00 2001 -From: Russ Allbery -Date: Wed, 15 Apr 2015 22:21:25 -0700 -Subject: Support an empty POD_MAN_DATE environment variable - -One may want to set this to an empty string. Handle that correctly. - -(backported to Perl 5.20.2 by Niko Tyni ) - -Origin: upstream, http://git.eyrie.org/?p=perl/podlators.git;a=commitdiff;h=e0e9fcb53e8fc954b2b1955385eea18c27f869af -Bug-Debian: https://bugs.debian.org/780259 -Patch-Name: fixes/podman-empty-date.diff -Upstream-Status: Pending ---- - cpan/podlators/lib/Pod/Man.pm | 2 +- - cpan/podlators/t/devise-date.t | 6 +++++- - 2 files changed, 6 insertions(+), 2 deletions(-) - -diff --git a/cpan/podlators/lib/Pod/Man.pm b/cpan/podlators/lib/Pod/Man.pm -index 365892e..8997a15 100644 ---- a/cpan/podlators/lib/Pod/Man.pm -+++ b/cpan/podlators/lib/Pod/Man.pm -@@ -894,7 +894,7 @@ sub devise_date { - my ($self) = @_; - - # If POD_MAN_DATE is set, always use it. -- if ($ENV{POD_MAN_DATE}) { -+ if (defined($ENV{POD_MAN_DATE})) { - return $ENV{POD_MAN_DATE}; - } - -diff --git a/cpan/podlators/t/devise-date.t b/cpan/podlators/t/devise-date.t -index 9da9d1b..27271d9 100644 ---- a/cpan/podlators/t/devise-date.t -+++ b/cpan/podlators/t/devise-date.t -@@ -12,7 +12,7 @@ use warnings; - use Pod::Man; - use POSIX qw(strftime); - --use Test::More tests => 2; -+use Test::More tests => 3; - - # Check that the results of device_date matches strftime. There is no input - # file name, so this will use the current time. -@@ -26,3 +26,7 @@ is( - # Set the override environment variable and ensure that it's honored. - local $ENV{POD_MAN_DATE} = '2014-01-01'; - is($parser->devise_date, '2014-01-01', 'devise_date honors POD_MAN_DATE'); -+ -+# Check that an empty environment variable is honored. -+local $ENV{POD_MAN_DATE} = q{}; -+is($parser->devise_date, q{}, 'devise_date honors empty POD_MAN_DATE'); diff --git a/meta/recipes-devtools/perl/perl/debian/fixes/podman-pipe.diff b/meta/recipes-devtools/perl/perl/debian/fixes/podman-pipe.diff deleted file mode 100644 index d8858d8a692..00000000000 --- a/meta/recipes-devtools/perl/perl/debian/fixes/podman-pipe.diff +++ /dev/null @@ -1,110 +0,0 @@ -From 7671d101baa75d7a79bfbd8c75c1595fbb3f53ba Mon Sep 17 00:00:00 2001 -From: Russ Allbery -Date: Sat, 7 Feb 2015 19:03:34 -0800 -Subject: Better errors for man pages from standard input - -[Pod::Man] Attempt to detect if the input came from a pipe and -therefore has a completely unhelpful (and nonreproducible) source file -name, and diagnose this as an error. Document that the name option -(--name to pod2man) is required when processing POD source from -standard input. (Debian Bug#777405) - -(backported to Perl 5.20.2 by Niko Tyni ) - -Origin: upstream, http://git.eyrie.org/?p=perl/podlators.git;a=commitdiff;h=d98872e46c93861b7aba14949e1258712087dc55 -Bug-Debian: https://bugs.debian.org/777405 -Patch-Name: fixes/podman-pipe.diff -Upstream-Status: Pending ---- - cpan/podlators/lib/Pod/Man.pm | 15 +++++++++++++++ - cpan/podlators/scripts/pod2man.PL | 4 ++++ - cpan/podlators/t/devise-title.t | 32 ++++++++++++++++++++++++++++++++ - 3 files changed, 51 insertions(+) - create mode 100755 cpan/podlators/t/devise-title.t - -diff --git a/cpan/podlators/lib/Pod/Man.pm b/cpan/podlators/lib/Pod/Man.pm -index 8997a15..969eaff 100644 ---- a/cpan/podlators/lib/Pod/Man.pm -+++ b/cpan/podlators/lib/Pod/Man.pm -@@ -828,6 +828,17 @@ sub devise_title { - $section = 3 if (!$$self{section} && $name =~ /\.pm\z/i); - $name =~ s/\.p(od|[lm])\z//i; - -+ # If Pod::Parser gave us an IO::File reference as the source file name, -+ # convert that to the empty string as well. Then, if we don't have a -+ # valid name, emit a warning and convert it to STDIN. -+ if ($name =~ /^IO::File(?:=\w+)\(0x[\da-f]+\)$/i) { -+ $name = ''; -+ } -+ if ($name eq '') { -+ $self->whine (1, 'No name given for document'); -+ $name = 'STDIN'; -+ } -+ - # If the section isn't 3, then the name defaults to just the basename of - # the file. Otherwise, assume we're dealing with a module. We want to - # figure out the full module name from the path to the file, but we don't -@@ -1705,6 +1716,10 @@ module path. If it is, a path like C<.../lib/Pod/Man.pm> is converted into - a name like C. This option, if given, overrides any automatic - determination of the name. - -+If generating a manual page from standard input, this option is required, -+since there's otherwise no way for Pod::Man to know what to use for the -+manual page name. -+ - =item nourls - - Normally, LZ<><> formatting codes with a URL but anchor text are formatted -diff --git a/cpan/podlators/scripts/pod2man.PL b/cpan/podlators/scripts/pod2man.PL -index 38695f8..43e35df 100644 ---- a/cpan/podlators/scripts/pod2man.PL -+++ b/cpan/podlators/scripts/pod2man.PL -@@ -236,6 +236,10 @@ Note that this option is probably not useful when converting multiple POD - files at once. The convention for Unix man pages for commands is for the - man page title to be in all-uppercase even if the command isn't. - -+When converting POD source from standard input, this option is required, -+since there's otherwise no way to know what to use as the name of the -+manual page. -+ - =item B<--nourls> - - Normally, LZ<><> formatting codes with a URL but anchor text are formatted -diff --git a/cpan/podlators/t/devise-title.t b/cpan/podlators/t/devise-title.t -new file mode 100755 -index 0000000..8639441 ---- /dev/null -+++ b/cpan/podlators/t/devise-title.t -@@ -0,0 +1,32 @@ -+#!/usr/bin/perl -+# -+# Tests for the automatic determination of the manual page title if not -+# specified via options to pod2man or the Pod::Man constructor. -+ -+use 5.006; -+use strict; -+use warnings; -+ -+use File::Spec; -+use IO::File; -+use Test::More tests => 3; -+ -+BEGIN { -+ use_ok('Pod::Man'); -+} -+ -+# Create a parser and set it up with an input source. There isn't a way to do -+# this in Pod::Simple without actually parsing the document, so send the -+# output to a string that we'll ignore. -+my $path = File::Spec->catdir('t', 'data', 'basic.pod'); -+my $handle = IO::File->new($path, 'r'); -+my $parser = Pod::Man->new(errors => 'pod'); -+my $output; -+$parser->output_string(\$output); -+$parser->parse_file($handle); -+ -+# Check the results of devise_title for this. We should get back STDIN, and -+# we should have reported an error. -+my ($name, $section) = $parser->devise_title; -+is($name, 'STDIN', 'devise_title uses STDIN for file handle input'); -+ok($parser->errors_seen, '...and errors were seen'); diff --git a/meta/recipes-devtools/perl/perl/debian/fixes/podman-utc-docs.diff b/meta/recipes-devtools/perl/perl/debian/fixes/podman-utc-docs.diff deleted file mode 100644 index b6ae409ac02..00000000000 --- a/meta/recipes-devtools/perl/perl/debian/fixes/podman-utc-docs.diff +++ /dev/null @@ -1,87 +0,0 @@ -From 6198856b5323d6204094293f01b890472618f182 Mon Sep 17 00:00:00 2001 -From: Russ Allbery -Date: Wed, 15 Apr 2015 20:49:07 -0700 -Subject: Documentation and test suite updates for UTC fix - -Update the Pod::Man and pod2man documentation and the test suite -for the new UTC-based default page footer, and add a Changes -entry. - -(backported to Perl 5.20.2 by Niko Tyni ) - -Origin: upstream, http://git.eyrie.org/?p=perl/podlators.git;a=commitdiff;h=52db93bf80e4a06f8497e4ebade0506b6ee0e70d -Bug-Debian: https://bugs.debian.org/780259 -Patch-Name: fixes/podman-utc-docs.diff -Upstream-Status: Pending ---- - cpan/podlators/lib/Pod/Man.pm | 6 +++++- - cpan/podlators/scripts/pod2man.PL | 11 ++++++----- - cpan/podlators/t/devise-date.t | 2 +- - 3 files changed, 12 insertions(+), 7 deletions(-) - -diff --git a/cpan/podlators/lib/Pod/Man.pm b/cpan/podlators/lib/Pod/Man.pm -index c3ba201..365892e 100644 ---- a/cpan/podlators/lib/Pod/Man.pm -+++ b/cpan/podlators/lib/Pod/Man.pm -@@ -910,6 +910,8 @@ sub devise_date { - - # Can't use POSIX::strftime(), which uses Fcntl, because MakeMaker uses - # this and it has to work in the core which can't load dynamic libraries. -+ # Use gmtime instead of localtime so that the generated man page does not -+ # depend on the local time zone setting and is more reproducible - my ($year, $month, $day) = (gmtime($time))[5,4,3]; - return sprintf("%04d-%02d-%02d", $year + 1900, $month + 1, $day); - } -@@ -1656,7 +1658,9 @@ environment variable POD_MAN_DATE, if set, will be used. Failing that, - the modification date of the input file will be used, or the current time - if stat() can't find that file (which will be the case if the input is - from C). If obtained from the file modification date or the --current time, he date will be formatted as C. -+current time, the date will be formatted as C and will be based -+on UTC (so that the output will be reproducible regardless of local time -+zone). - - =item errors - -diff --git a/cpan/podlators/scripts/pod2man.PL b/cpan/podlators/scripts/pod2man.PL -index 6af3474..38695f8 100644 ---- a/cpan/podlators/scripts/pod2man.PL -+++ b/cpan/podlators/scripts/pod2man.PL -@@ -174,9 +174,10 @@ Contributed Perl Documentation", but also see B<--official> below. - - =item B<-d> I, B<--date>=I - --Set the left-hand footer string to this value. By default, the modification --date of the input file will be used, or the current date if input comes from --C. -+Set the left-hand footer string to this value. By default, the -+modification date of the input file will be used, or the current date if -+input comes from C, and will be based on UTC (so that the output -+will be reproducible regardless of local time zone). - - =item B<-errors>=I