[packages/perl] remove fix-h2ph-and-test and INC patches
atler
atler at pld-linux.org
Mon May 3 16:58:03 CEST 2021
commit 67d9b1ee97391c415520a2bbdb8e72b12d524277
Author: Jan Palus <atler at pld-linux.org>
Date: Mon May 3 16:54:18 2021 +0200
remove fix-h2ph-and-test and INC patches
...dropped from spec in c196311 and 253f30c respectively
perl-fix-h2ph-and-test.patch | 95 --------------------------------------------
perl_581-INC.patch | 71 ---------------------------------
2 files changed, 166 deletions(-)
---
diff --git a/perl-fix-h2ph-and-test.patch b/perl-fix-h2ph-and-test.patch
deleted file mode 100644
index 9a8c38e..0000000
--- a/perl-fix-h2ph-and-test.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-From 8d66b3f930dc6d88b524d103e304308ae73a46e7 Mon Sep 17 00:00:00 2001
-From: Robin Barker <rmbarker at cpan.org>
-Date: Thu, 22 Apr 2010 11:51:20 +0100
-Subject: [PATCH] Fix h2ph and test
-
----
- lib/h2ph.t | 12 ++++++++++--
- utils/h2ph.PL | 28 +++++++++++++++++++++++-----
- 2 files changed, 33 insertions(+), 7 deletions(-)
-
-diff --git a/lib/h2ph.t b/lib/h2ph.t
-index 27dd7b9..8d62d46 100644
---- a/lib/h2ph.t
-+++ b/lib/h2ph.t
-@@ -41,8 +41,16 @@ $result = runperl( progfile => 'lib/h2ph.pht',
- stderr => 1 );
- like( $result, qr/syntax OK$/, "output compiles");
-
-+$result = runperl( progfile => '_h2ph_pre.ph',
-+ switches => ['-c'],
-+ stderr => 1 );
-+like( $result, qr/syntax OK$/, "preamble compiles");
-+
- $result = runperl( switches => ["-w"],
-- prog => '$SIG{__WARN__} = sub { die $_[0] }; require q(lib/h2ph.pht);');
-+ stderr => 1,
-+ prog => <<'PROG' );
-+$SIG{__WARN__} = sub { die $_[0] }; require q(lib/h2ph.pht);
-+PROG
- is( $result, '', "output free of warnings" );
-
- # cleanup
-diff --git a/utils/h2ph.PL b/utils/h2ph.PL
-index 8f56db4..1255807 100644
---- a/utils/h2ph.PL
-+++ b/utils/h2ph.PL
-@@ -401,7 +401,10 @@ if ($opt_e && (scalar(keys %bad_file) > 0)) {
- exit $Exit;
-
- sub expr {
-- $new = '"(assembly code)"' and return if /\b__asm__\b/; # freak out.
-+ if (/\b__asm__\b/) { # freak out
-+ $new = '"(assembly code)"';
-+ return
-+ }
- my $joined_args;
- if(keys(%curargs)) {
- $joined_args = join('|', keys(%curargs));
-@@ -770,7 +773,7 @@ sub inc_dirs
- sub build_preamble_if_necessary
- {
- # Increment $VERSION every time this function is modified:
-- my $VERSION = 2;
-+ my $VERSION = 3;
- my $preamble = "$Dest_dir/_h2ph_pre.ph";
-
- # Can we skip building the preamble file?
-@@ -798,7 +801,16 @@ sub build_preamble_if_necessary
- # parenthesized value: d=(v)
- $define{$_} = $1;
- }
-- if ($define{$_} =~ /^([+-]?(\d+)?\.\d+([eE][+-]?\d+)?)[FL]?$/) {
-+ if (/^(\w+)\((\w)\)$/) {
-+ my($macro, $arg) = ($1, $2);
-+ my $def = $define{$_};
-+ $def =~ s/$arg/\$\{$arg\}/g;
-+ print PREAMBLE <<DEFINE;
-+unless (defined &$macro) { sub $macro(\$) { my (\$$arg) = \@_; \"$def\" } }
-+
-+DEFINE
-+ } elsif
-+ ($define{$_} =~ /^([+-]?(\d+)?\.\d+([eE][+-]?\d+)?)[FL]?$/) {
- # float:
- print PREAMBLE
- "unless (defined &$_) { sub $_() { $1 } }\n\n";
-@@ -807,8 +819,14 @@ sub build_preamble_if_necessary
- print PREAMBLE
- "unless (defined &$_) { sub $_() { $1 } }\n\n";
- } elsif ($define{$_} =~ /^\w+$/) {
-- print PREAMBLE
-- "unless (defined &$_) { sub $_() { &$define{$_} } }\n\n";
-+ my $def = $define{$_};
-+ if ($isatype{$def}) {
-+ print PREAMBLE
-+ "unless (defined &$_) { sub $_() { \"$def\" } }\n\n";
-+ } else {
-+ print PREAMBLE
-+ "unless (defined &$_) { sub $_() { &$def } }\n\n";
-+ }
- } else {
- print PREAMBLE
- "unless (defined &$_) { sub $_() { \"",
---
-1.6.5.2.74.g610f9.dirty
-
diff --git a/perl_581-INC.patch b/perl_581-INC.patch
deleted file mode 100644
index 8bb3959..0000000
--- a/perl_581-INC.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-diff --git a/perl.c b/perl.c
-index dfb549d..9b5dd4c 100644
---- a/perl.c
-+++ b/perl.c
-@@ -4151,26 +4151,6 @@ S_init_perllib(pTHX)
- # endif
- #endif
-
--#ifdef ARCHLIB_EXP
-- S_incpush_use_sep(aTHX_ STR_WITH_LEN(ARCHLIB_EXP), INCPUSH_CAN_RELOCATE);
--#endif
--
--#ifndef PRIVLIB_EXP
--# define PRIVLIB_EXP "/usr/local/lib/perl5:/usr/local/lib/perl"
--#endif
--
--#if defined(WIN32)
-- s = win32_get_privlib(PERL_FS_VERSION, &len);
-- if (s)
-- incpush_use_sep(s, len, INCPUSH_ADD_SUB_DIRS|INCPUSH_CAN_RELOCATE);
--#else
--# ifdef NETWARE
-- S_incpush_use_sep(aTHX_ PRIVLIB_EXP, 0, INCPUSH_CAN_RELOCATE);
--# else
-- S_incpush_use_sep(aTHX_ STR_WITH_LEN(PRIVLIB_EXP), INCPUSH_CAN_RELOCATE);
--# endif
--#endif
--
- #ifdef PERL_OTHERLIBDIRS
- S_incpush_use_sep(aTHX_ STR_WITH_LEN(PERL_OTHERLIBDIRS),
- INCPUSH_ADD_VERSIONED_SUB_DIRS|INCPUSH_NOT_BASEDIR
-@@ -4216,15 +4196,35 @@ S_init_perllib(pTHX)
-
- #if defined(SITELIB_STEM) && defined(PERL_INC_VERSION_LIST)
- /* Search for version-specific dirs below here */
-- S_incpush_use_sep(aTHX_ STR_WITH_LEN(SITELIB_STEM),
-- INCPUSH_ADD_OLD_VERS|INCPUSH_CAN_RELOCATE);
-+/* S_incpush_use_sep(aTHX_ STR_WITH_LEN(SITELIB_STEM),
-+ INCPUSH_ADD_OLD_VERS|INCPUSH_CAN_RELOCATE); */
- #endif
-
-
- #if defined(PERL_VENDORLIB_STEM) && defined(PERL_INC_VERSION_LIST)
- /* Search for version-specific dirs below here */
-- S_incpush_use_sep(aTHX_ STR_WITH_LEN(PERL_VENDORLIB_STEM),
-- INCPUSH_ADD_OLD_VERS|INCPUSH_CAN_RELOCATE);
-+/* S_incpush_use_sep(aTHX_ STR_WITH_LEN(PERL_VENDORLIB_STEM),
-+ INCPUSH_ADD_OLD_VERS|INCPUSH_CAN_RELOCATE); */
-+#endif
-+
-+#ifdef ARCHLIB_EXP
-+ S_incpush_use_sep(aTHX_ STR_WITH_LEN(ARCHLIB_EXP), INCPUSH_CAN_RELOCATE);
-+#endif
-+
-+#ifndef PRIVLIB_EXP
-+# define PRIVLIB_EXP "/usr/local/lib/perl5:/usr/local/lib/perl"
-+#endif
-+
-+#if defined(WIN32)
-+ s = win32_get_privlib(PERL_FS_VERSION, &len);
-+ if (s)
-+ incpush_use_sep(s, len, INCPUSH_ADD_SUB_DIRS|INCPUSH_CAN_RELOCATE);
-+#else
-+# ifdef NETWARE
-+ S_incpush_use_sep(aTHX_ PRIVLIB_EXP, 0, INCPUSH_CAN_RELOCATE);
-+# else
-+ S_incpush_use_sep(aTHX_ STR_WITH_LEN(PRIVLIB_EXP), INCPUSH_CAN_RELOCATE);
-+# endif
- #endif
-
- #ifdef PERL_OTHERLIBDIRS
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/perl.git/commitdiff/67d9b1ee97391c415520a2bbdb8e72b12d524277
More information about the pld-cvs-commit
mailing list