From 085469acf2c2fe0d62e936553720612923d6c3f8 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Thu, 25 Apr 2019 23:29:59 +0200 Subject: [PATCH] perl: fix gcc2 bug in locale.c. char is promoted to int, which then fails to compare correcly with char. --- dev-lang/perl/patches/perl-5.28.1.patchset | 83 ++++++++++++++-------- dev-lang/perl/perl-5.28.1.recipe | 2 +- 2 files changed, 54 insertions(+), 31 deletions(-) diff --git a/dev-lang/perl/patches/perl-5.28.1.patchset b/dev-lang/perl/patches/perl-5.28.1.patchset index 01005c1ff..ae6eb1be0 100644 --- a/dev-lang/perl/patches/perl-5.28.1.patchset +++ b/dev-lang/perl/patches/perl-5.28.1.patchset @@ -1,4 +1,4 @@ -From d339ed2fb7f2002bec6bd63404c68dc48bbd1b50 Mon Sep 17 00:00:00 2001 +From 3db6700b9b3faaa2b0afaba91e53383929653ecb Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Sun, 22 Sep 2013 14:52:03 +0200 Subject: Tell perl that BFS has a link count of 1 @@ -19,10 +19,10 @@ index 817c6d9..c3298a6 100644 # fall-through if we can't unlink now _deferred_unlink($fh, $path, 0); -- -2.19.1 +2.21.0 -From dec15fc8ed3d9087a690fafdf8ee6297a3f2d511 Mon Sep 17 00:00:00 2001 +From 4eabb29aee8c3a2d888e70123e554a5f28dd2f85 Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Sun, 22 Sep 2013 14:52:53 +0200 Subject: Haiku defines, but does not implement O_EXLOCK @@ -43,10 +43,10 @@ index ff8c7f9..4364bf6 100644 } else { plan tests => 4; -- -2.19.1 +2.21.0 -From 6ffc1e6891e58a482915c6342057991f4e34b053 Mon Sep 17 00:00:00 2001 +From bac2c3f2d94428de753f69c061882830dbc347a2 Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Sun, 22 Sep 2013 14:53:40 +0200 Subject: haiku sets all its specifics via Configure @@ -103,10 +103,10 @@ index fa8ebe5..0f09f53 100644 - +# haiku sets all its specifics via Configure -- -2.19.1 +2.21.0 -From 07475068d72d6f405959b6d762c5cd2f9f648caa Mon Sep 17 00:00:00 2001 +From ca22cd63f9ca9539a7093e74bc78204f13f3c6e2 Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Sun, 22 Sep 2013 14:54:15 +0200 Subject: Tell perl that Haiku needs haikuish.h installed as well @@ -129,10 +129,10 @@ index 3bf79d2..5cb6b3f 100755 -- -2.19.1 +2.21.0 -From f59001939d1f869ad219373a9dee4fa0831ec12a Mon Sep 17 00:00:00 2001 +From 84218cf7e177c3c172016daa255956e4a200d71f Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Sun, 22 Sep 2013 14:55:13 +0200 Subject: Fix handling of exit codes on Haiku @@ -180,10 +180,10 @@ index ce3270e..cab9a79 100644 } -- -2.19.1 +2.21.0 -From 882a596f38a8369ddd5bf1c60a2ef13868cfae91 Mon Sep 17 00:00:00 2001 +From b935e9ef50b380b18511c12f3496e4f35a1bd460 Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Sun, 22 Sep 2013 15:00:44 +0200 Subject: Fix include path of errno.h @@ -203,10 +203,10 @@ index d565f31..f0ee43b 100644 } elsif ($^O eq 'vos') { # avoid problem where cpp returns non-POSIX pathnames -- -2.19.1 +2.21.0 -From f98268d52ffec022e9535a54da38f90aba1f1883 Mon Sep 17 00:00:00 2001 +From 519a5e068966c7d04c8796d6e73d8c5d5ae01a9d Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Sat, 28 Sep 2013 13:46:42 +0200 Subject: Adjust ExtUtils::MakeMaker for PM-Haiku. @@ -307,10 +307,10 @@ index 0000000..81e5f99 +__END__ + -- -2.19.1 +2.21.0 -From 28d78e12c352eb4f0146379ac3937650f1e439bc Mon Sep 17 00:00:00 2001 +From 014cd8b9ff8639d212e1f29dec307f58cd5d0e83 Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Tue, 8 Oct 2013 22:16:37 +0200 Subject: Avoid using -rpath for dynamic modules. @@ -355,10 +355,10 @@ index 81e5f99..25ace13 100644 __END__ -- -2.19.1 +2.21.0 -From dde00c01740ed18b9b9652877d3c9d6c9fad16f8 Mon Sep 17 00:00:00 2001 +From 9b18cb650121876c6a7087fb2c0fcc7a958ce537 Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Tue, 8 Oct 2013 22:17:26 +0200 Subject: Add script sitecustomize.pl for setting up @INC as we need it. @@ -407,10 +407,10 @@ index 0000000..a321e51 +} +@INC = @newINC; -- -2.19.1 +2.21.0 -From 439d51b50b7b320f722d944018e9626458f45c98 Mon Sep 17 00:00:00 2001 +From 3764128c11b9d4327d08c99e714d4226dc8d96e0 Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Wed, 9 Oct 2013 20:29:38 +0200 Subject: Fix initialization check for CPAN. @@ -437,10 +437,10 @@ index 49fa8ab..bc701d8 100644 && -w $Config{installarchlib} && -w $Config{installsitelib} -- -2.19.1 +2.21.0 -From 08026a60b07f87191acc97ca5488b36ffdbc70b0 Mon Sep 17 00:00:00 2001 +From a64e11a378dd9adcdba97af967f94306e8ebd763 Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Sun, 13 Oct 2013 17:32:50 +0200 Subject: Add support for HAIKU_USE_VENDOR_DIRECTORIES. @@ -513,10 +513,10 @@ index 25ace13..8a04ead 100644 __END__ -- -2.19.1 +2.21.0 -From d55c13b6d0d69883af9b718450101e68a4843071 Mon Sep 17 00:00:00 2001 +From a4dbb9ef2b1c5e42b5b17a55c11cb2988856842c Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Fri, 9 Jun 2017 21:30:33 +0200 Subject: disable fstack-protector for Haiku @@ -535,10 +535,10 @@ index 3be9f05..e5c3c0a 100755 ?*) set stack-protector-strong -fstack-protector-strong eval $checkccflag -- -2.19.1 +2.21.0 -From 306d0055e8623178642dc7d8dbc78b711ce4d1fc Mon Sep 17 00:00:00 2001 +From 7c1c6508a5be3606e9c4d77041eba0e57b5666ac Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Wed, 14 Mar 2018 21:33:54 +0100 Subject: sitecustomize.pl: use the shortVersion for site and vendor. @@ -575,10 +575,10 @@ index a321e51..76c0e46 100644 ); my @newINC; -- -2.19.1 +2.21.0 -From ebf4ae7e897a646b2837a66f35616f27361efcb1 Mon Sep 17 00:00:00 2001 +From 7e4b9dd12eba09d7d0df167ab8576ef6db9e4308 Mon Sep 17 00:00:00 2001 From: Tony Cook Date: Tue, 7 Aug 2018 15:34:06 +1000 Subject: (perl #133326) fix and clarify handling of recurs_sv. @@ -864,10 +864,10 @@ index fa8be0b..63fde90 100644 + "low depth structure shouldn't be treated as nested"); } -- -2.19.1 +2.21.0 -From fd0aa0b823dcdda73713f4e8ad6fc820bd696b72 Mon Sep 17 00:00:00 2001 +From 517d79b3f74b6093e527d2e417d76ff8079506c9 Mon Sep 17 00:00:00 2001 From: Tony Cook Date: Tue, 4 Dec 2018 15:11:17 +1100 Subject: (perl #133708) remove build-time probing for stack limits for @@ -1324,5 +1324,28 @@ index a6072a9..15b148d 100644 -del /f $(LIBDIR)\Win32CORE.pm -del /f $(LIBDIR)\Win32API\File.pm -- -2.19.1 +2.21.0 + + +From 8b7162312646bf1ac283e8765dd328d049f170c8 Mon Sep 17 00:00:00 2001 +From: Jerome Duval +Date: Thu, 25 Apr 2019 23:19:43 +0200 +Subject: locale.c: cast to char before comparing with a char constant. + + +diff --git a/locale.c b/locale.c +index 5b6460a..dc7cb0b 100644 +--- a/locale.c ++++ b/locale.c +@@ -4927,7 +4927,7 @@ Perl__is_cur_LC_category_utf8(pTHX_ int category) + Copy(delimited, utf8ness_cache, input_name_len_with_overhead - 1, char); + utf8ness_cache[input_name_len_with_overhead - 1] = is_utf8 + '0'; + +- if ((PL_locale_utf8ness[strlen(PL_locale_utf8ness)-1] ++ if ((char)(PL_locale_utf8ness[strlen(PL_locale_utf8ness)-1] + & (PERL_UINTMAX_T) ~1) != '0') + { + Perl_croak(aTHX_ +-- +2.21.0 diff --git a/dev-lang/perl/perl-5.28.1.recipe b/dev-lang/perl/perl-5.28.1.recipe index 4f52699ca..5b1e0df0e 100644 --- a/dev-lang/perl/perl-5.28.1.recipe +++ b/dev-lang/perl/perl-5.28.1.recipe @@ -16,7 +16,7 @@ HOMEPAGE="http://www.perl.org/" COPYRIGHT="1993-2018 Larry Wall and others" LICENSE="GNU GPL v1 Artistic" -REVISION="1" +REVISION="2" perlShortVersion="${portVersion%.*}" SOURCE_URI="http://www.cpan.org/src/perl-$portVersion.tar.gz" CHECKSUM_SHA256="3ebf85fe65df2ee165b22596540b7d5d42f84d4b72d84834f74e2e0b8956c347"