SHA256
1
0
forked from pool/perl
perl/perl-incfix.diff
Dirk Stoecker e114c70ffb Accepting request 915813 from home:dstoecker:branches:devel:languages:perl
- update to 5.34.0
  * Experimental Try/Catch Syntax
  * Blanks freely allowed within but adjacent to curly braces
  * New octal syntax 0oddddd
  * Fix a memory leak in RegEx [GH #18604]
  * ExtUtils::PL2Bat 0.004 has been added to the Perl core.
  * Updated Modules and Pragmata
- Rebase perl-5.28.0.dif to perl-5.34.0.dif
- Rebase perl-incfix.diff
- Rebase perl_skip_flaky_tests_powerpc.patch
- Drop perl-gdbm-test-no-mmap.diff (no longer needed with gdbm 1.20)
- Add c029d660f2fe60699cf64bbb3fa9f671a1a370d5.patch to fix build with
  gdbm 1.20
- Drop perl-fix2020.patch (included upstream)

OBS-URL: https://build.opensuse.org/request/show/915813
OBS-URL: https://build.opensuse.org/package/show/devel:languages:perl/perl?expand=0&rev=204
2021-09-13 11:48:09 +00:00

40 lines
1.7 KiB
Diff

diff -ur perl-5.34.0/perl_inc_macro.h perl-5.34.0_fix/perl_inc_macro.h
--- perl-5.34.0/perl_inc_macro.h 2021-01-21 00:04:44.000000000 +0100
+++ perl-5.34.0_fix/perl_inc_macro.h 2021-08-28 14:20:24.781533820 +0200
@@ -83,10 +83,12 @@
# define INCPUSH_PRIVLIB_EXP S_incpush_use_sep(aTHX_ STR_WITH_LEN(PRIVLIB_EXP), INCPUSH_CAN_RELOCATE);
#endif
+#if 0
#ifdef PERL_OTHERLIBDIRS
# define INCPUSH_PERL_OTHERLIBDIRS S_incpush_use_sep(aTHX_ STR_WITH_LEN(PERL_OTHERLIBDIRS), \
INCPUSH_ADD_VERSIONED_SUB_DIRS|INCPUSH_NOT_BASEDIR|INCPUSH_CAN_RELOCATE);
#endif
+#endif
/* submacros for INCPUSH_PERL5LIB */
@@ -133,19 +135,19 @@
#if defined(SITELIB_STEM) && defined(PERL_INC_VERSION_LIST)
/* Search for version-specific dirs below here */
# define INCPUSH_SITELIB_STEM S_incpush_use_sep(aTHX_ STR_WITH_LEN(SITELIB_STEM), \
- INCPUSH_ADD_OLD_VERS|INCPUSH_CAN_RELOCATE);
+ INCPUSH_ADD_OLD_VERS|INCPUSH_NOT_BASEDIR|INCPUSH_CAN_RELOCATE);
#endif
#if defined(PERL_VENDORLIB_STEM) && defined(PERL_INC_VERSION_LIST)
/* Search for version-specific dirs below here */
# define INCPUSH_PERL_VENDORLIB_STEM S_incpush_use_sep(aTHX_ STR_WITH_LEN(PERL_VENDORLIB_STEM), \
- INCPUSH_ADD_OLD_VERS|INCPUSH_CAN_RELOCATE);
+ INCPUSH_ADD_OLD_VERS|INCPUSH_NOT_BASEDIR|INCPUSH_CAN_RELOCATE);
#endif
#ifdef PERL_OTHERLIBDIRS
# define INCPUSH_PERL_OTHERLIBDIRS_ARCHONLY S_incpush_use_sep(aTHX_ STR_WITH_LEN(PERL_OTHERLIBDIRS), \
- INCPUSH_ADD_OLD_VERS|INCPUSH_ADD_ARCHONLY_SUB_DIRS|INCPUSH_CAN_RELOCATE);
+ INCPUSH_CAN_RELOCATE);
#endif