diff --git a/perl/0001-fix-various-pods.patch b/perl/0001-fix-various-pods.patch new file mode 100644 index 000000000000..4f3e3c01e2e7 --- /dev/null +++ b/perl/0001-fix-various-pods.patch @@ -0,0 +1,30 @@ +From 95d30af67bcbe14a0755e24c85400affc01eac20 Mon Sep 17 00:00:00 2001 +From: Matthias Aßhauer +Date: Wed, 12 Jul 2023 11:41:32 +0200 +Subject: [PATCH 1/7] fix paths for various .pod files + +--- + Makefile.SH | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/cpan/Win32/t/GetShortPathName.t b/cpan/Win32/t/GetShortPathName.t +index 649420a..82ce2d5 100644 +--- a/Makefile.SH ++++ b/Makefile.SH +@@ -1142,14 +1142,14 @@ + + pod/perl5380delta.pod: pod/perldelta.pod + $(RMS) pod/perl5380delta.pod +- $(LNS) perldelta.pod pod/perl5380delta.pod ++ $(LNS) pod/perldelta.pod pod/perl5380delta.pod + + extra.pods: $(MINIPERL_EXE) + -@test ! -f extra.pods || rm -f `cat extra.pods` + -@rm -f extra.pods + -@for x in `grep -l '^=[a-z]' README.* | grep -v README.vms` ; do \ + nx=`echo $$x | sed -e "s/README\.//"`; \ +- $(LNS) ../$$x "pod/perl"$$nx".pod" ; \ ++ $(LNS) ./$$x "pod/perl"$$nx".pod" ; \ + echo "pod/perl"$$nx".pod" >> extra.pods ; \ + done + \ No newline at end of file diff --git a/perl/0001-perl.cygwin-auto-image-base.patch b/perl/0001-perl.cygwin-auto-image-base.patch deleted file mode 100644 index e974040b8a25..000000000000 --- a/perl/0001-perl.cygwin-auto-image-base.patch +++ /dev/null @@ -1,25 +0,0 @@ -From d5098f3924649936b561b5a2a4bdb7fd34c9736a Mon Sep 17 00:00:00 2001 -From: Alexey Pavlov -Date: Tue, 14 Feb 2017 14:45:21 +0300 -Subject: [PATCH 1/7] perl.cygwin-auto-image-base - ---- - Makefile.SH | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile.SH b/Makefile.SH -index efeb8d6..e2490da 100755 ---- a/Makefile.SH -+++ b/Makefile.SH -@@ -73,7 +73,7 @@ true) - esac - ;; - cygwin*) -- shrpldflags="$shrpldflags -Wl,--out-implib=libperl.dll.a -Wl,--image-base,0x52000000" -+ shrpldflags="$shrpldflags -Wl,--out-implib=libperl.dll.a" - linklibperl="-L. -lperl" - ;; - sunos*) --- -2.37.1 - diff --git a/perl/0002-perl.cygwin-hints.patch b/perl/0002-perl.cygwin-hints.patch index 9123f1ebe9a6..3f3d931b1a5f 100644 --- a/perl/0002-perl.cygwin-hints.patch +++ b/perl/0002-perl.cygwin-hints.patch @@ -11,10 +11,17 @@ diff --git a/hints/cygwin.sh b/hints/cygwin.sh index 40edf5f..bda3da8 100644 --- a/hints/cygwin.sh +++ b/hints/cygwin.sh -@@ -25,12 +25,21 @@ libswanted=`echo " $libswanted " | sed -e 's/ c / /g'` +@@ -25,13 +25,13 @@ libswanted=`echo " $libswanted " | sed -e 's/ c / /g'` libswanted=`echo " $libswanted " | sed -e 's/ m / /g'` # - eliminate -lutil, symbols are all in libcygwin.a libswanted=`echo " $libswanted " | sed -e 's/ util / /g'` +-test -z "$ignore_versioned_solibs" && ignore_versioned_solibs='y' +-test -z "$usenm" && usenm='no' +-test -z "$libc" && libc='/usr/lib/libcygwin.a' +-test -z "$loclibpth" && loclibpth=' ' +-test -z "$glibpth" && glibpth=' ' +-test -z "$plibpth" && plibpth=' ' +-test -z "$libpth" && libpth=' ' +ignore_versioned_solibs='y' +usenm='no' +libc='/usr/lib/libcygwin.a' @@ -22,17 +29,9 @@ index 40edf5f..bda3da8 100644 +glibpth=' ' +plibpth=' ' +libpth=' ' -+PATH='.:/usr/bin/' + PATH='.:/usr/bin/' # - add libgdbm_compat $libswanted libswanted="$libswanted gdbm_compat" - test -z "$optimize" && optimize='-O3' - man3ext='3pm' - test -z "$use64bitint" && use64bitint='define' - test -z "$useithreads" && useithreads='define' -+test -z "$usemymalloc" && usemymalloc='undef' - ccflags="$ccflags -DPERL_USE_SAFE_PUTENV -U__STRICT_ANSI__ -D_GNU_SOURCE" - # - otherwise i686-cygwin - archname='cygwin' @@ -62,6 +71,13 @@ case "$osvers" in d_inetpton='undef' esac diff --git a/perl/0003-perl.cygwin-Configure-libsearch.patch b/perl/0003-perl.cygwin-Configure-libsearch.patch index bb55601ccde2..6bc10d3f6648 100644 --- a/perl/0003-perl.cygwin-Configure-libsearch.patch +++ b/perl/0003-perl.cygwin-Configure-libsearch.patch @@ -4,8 +4,8 @@ Date: Tue, 14 Feb 2017 14:45:21 +0300 Subject: [PATCH 3/7] perl.cygwin-Configure-libsearch --- - Configure | 62 ++++++++++++++++++++++++++++++++++--------------------- - 1 file changed, 39 insertions(+), 23 deletions(-) + Configure | 24 ++++++++++++++++++++++++++++++++++--------------------- + 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/Configure b/Configure index bd96249..4febcd8 100755 @@ -19,7 +19,7 @@ index bd96249..4febcd8 100755 lib_ext='' obj_ext='' path_sep='' -@@ -5256,29 +5257,44 @@ done +@@ -5251,20 +5252,25 @@ done for thislib in $libswanted; do for thisdir in $libspath; do xxx='' @@ -32,20 +32,6 @@ index bd96249..4febcd8 100755 - $test -f "$xxx" && libstyle=shared - fi - if test ! -f "$xxx"; then -- xxx=$thisdir/lib$thislib.$so -- $test -f "$xxx" && eval $libscheck -- $test -f "$xxx" && libstyle=shared -- fi -- if test ! -f "$xxx"; then -- xxx=$thisdir/lib$thislib$_a -- $test -f "$xxx" && eval $libscheck -- $test -f "$xxx" && libstyle=static -- fi -- if test ! -f "$xxx"; then -- xxx=$thisdir/$thislib$_a -- $test -f "$xxx" && eval $libscheck -- $test -f "$xxx" && libstyle=static -- fi + if $test ! -f "$xxx" -a "X$ignore_versioned_solibs" = "X"; then + xxx=`ls $thisdir/lib$thislib.$so.[0-9] 2>/dev/null|sed -n '$p'` + $test -f "$xxx" && eval $libscheck @@ -55,38 +41,19 @@ index bd96249..4febcd8 100755 + $test -f "$xxx" && libstyle=shared + fi + if test ! -f "$xxx"; then + xxx=$thisdir/lib$thislib.$so$_a + $test -f "$xxx" && eval $libscheck + $test -f "$xxx" && libstyle="import" + fi + if test ! -f "$xxx"; then + xxx=$thisdir/lib$thislib.$so$_a + $test -f "$xxx" && eval $libscheck + $test -f "$xxx" && libstyle="import" + fi + if test ! -f "$xxx"; then -+ xxx=$thisdir/$thislib.$so$_a -+ $test -f "$xxx" && eval $libscheck -+ $test -f "$xxx" && libstyle="import" -+ fi -+ if test ! -f "$xxx"; then -+ xxx=$thisdir/lib$thislib.$so -+ $test -f "$xxx" && eval $libscheck -+ $test -f "$xxx" && libstyle=shared -+ fi -+ if test ! -f "$xxx"; then -+ xxx=$thisdir/$libprefix$thislib.$so -+ $test -f "$xxx" && eval $libscheck -+ $test -f "$xxx" && libstyle="system" -+ fi -+ if test ! -f "$xxx"; then -+ xxx=$thisdir/lib$thislib$_a -+ $test -f "$xxx" && eval $libscheck -+ $test -f "$xxx" && libstyle=static -+ fi -+ if test ! -f "$xxx"; then -+ xxx=$thisdir/$thislib$_a -+ $test -f "$xxx" && eval $libscheck -+ $test -f "$xxx" && libstyle=static -+ fi - if test ! -f "$xxx"; then - xxx=$thisdir/lib${thislib}_s$_a - $test -f "$xxx" && eval $libscheck + xxx=$thisdir/$thislib.$so$_a + $test -f "$xxx" && eval $libscheck + $test -f "$xxx" && libstyle="import" -- 2.37.1 diff --git a/perl/0006-perl-5.36.0-msys2.patch b/perl/0006-perl-5.36.0-msys2.patch index fa970a8c04db..e7fbaa60aca4 100644 --- a/perl/0006-perl-5.36.0-msys2.patch +++ b/perl/0006-perl-5.36.0-msys2.patch @@ -1177,8 +1177,8 @@ index 203d86b..9246a21 100644 $p->{port_num} = $port2; { -- local $TODO = "Believed not to work on $^O" if $^O =~ /^(?:hpux|MSWin32|os390|freebsd)$/; -+ local $TODO = "Believed not to work on $^O" if $^O =~ /^(?:hpux|MSWin32|msys|os390|freebsd)$/; +- local $TODO = "Believed not to work on $^O" if $^O =~ /^(?:MSWin32|os390)$/; ++ local $TODO = "Believed not to work on $^O" if $^O =~ /^(?:MSWin32|msys|os390)$/; is($p->ping("127.0.0.1"), 1, 'second port is reachable'); } @@ -1186,8 +1186,8 @@ index 203d86b..9246a21 100644 { local $TODO = "Believed not to work on $^O" -- if $^O =~ /^(?:hpux|MSWin32|os390|freebsd)$/; -+ if $^O =~ /^(?:hpux|MSWin32|msys|os390|freebsd)$/; +- if $^O =~ /^(?:MSWin32|os390)$/; ++ if $^O =~ /^(?:MSWin32|msys|os390)$/; is($p->ack(), '127.0.0.1', 'IP should be reachable'); } } diff --git a/perl/PKGBUILD b/perl/PKGBUILD index a80eae352344..20ffaa62b8a5 100644 --- a/perl/PKGBUILD +++ b/perl/PKGBUILD @@ -16,7 +16,7 @@ source=(https://www.cpan.org/src/5.0/perl-${pkgver}.tar.xz perlbin.csh perlbin.fish perl-binary-module-dependency-1.template - 0001-perl.cygwin-auto-image-base.patch + 0001-fix-various-pods.patch 0002-perl.cygwin-hints.patch 0003-perl.cygwin-Configure-libsearch.patch 0004-perl.cygwin-Configure-libpth.patch @@ -149,19 +149,19 @@ sha256sums=('eca551caec3bc549a4e590c0015003790bdd1a604ffe19cc78ee631d51f7072e' '478a52dc440d5ca324f4c95238b39cc8c90d5d7d8d5601fa085ffef79fea04f4' '11ce66bcf4803b0bf27179a32ce53f41bcdfa967c4c0d54ac103dbc4951d18a3' 'fe91f1de38af525cb82503feef553b71299c52ea52c01b1959143f48f4051ffa' - 'b3bd02ed1d8a2ae160d9b16359f0c4a347e7990206ed972a41849abe695ca337' - 'ba3259e3e82ee80820426fd407b5e3ddf01a6146d8309e2eabd5347221ab2ab3' - '48c58ecf9de7fbfe620504ed462bae4c855758dbd21f475d9d646bfa92c87aea' + '49f7122338500e1bc211766102eae959910d199f930bbcd47520dadae9b2c793' + 'e45df328a7128604a1a7b901e44da67f7ebb34162ca23c980b4e36553c0e7449' + 'a074ce00dabd7876293cf0fa8c8be26029992f51873e33cd2213b6acf60cafbb' '1bf02b601f670cc1c8f65e63ec7a10578f92c8ecd8a5752fe331479bd6115311' 'e05e20b29c950555edfa246d2b9177188a4b265d1887c262f5b272f382696474' - 'd8935f9a246ba112036d3081cf928f9539fcc5de777b678e83978877732f679f' + '3ec217cb7f47c34a79addb9396d522596495584aaf6b24b17c6caf6a16d2cb62' '4c44801139321e77a3ade921ce93b114100346ad5b17d03a67b2a92b85ee8a27') prepare() { chmod -R 0666 ${srcdir}/${pkgname}-${pkgver} cd ${srcdir}/${pkgname}-${pkgver} - patch -p1 -i ${srcdir}/0001-perl.cygwin-auto-image-base.patch + patch -p1 -i ${srcdir}/0001-fix-various-pods.patch patch -p1 -i ${srcdir}/0002-perl.cygwin-hints.patch patch -p1 -i ${srcdir}/0003-perl.cygwin-Configure-libsearch.patch patch -p1 -i ${srcdir}/0004-perl.cygwin-Configure-libpth.patch