testing/perl
SHA256
6
0
Fork 0
forked from pool/perl
Code Pull Requests Activity

Accepting request 637215 from home:dstoecker

Browse Source 
Update to 5.28, please check - I tried to follow previous updates, but maybe I overlooked something.

3rd try to get the patch right.

OBS-URL: https://build.opensuse.org/request/show/637215
OBS-URL: https://build.opensuse.org/package/show/devel:languages:perl/perl?expand=0&rev=168
This commit is contained in:
Michael Schröder
2018-09-26 09:53:14 +00:00
committed by Git OBS Bridge
parent 44127b9d3e
commit e75b29dfe5
8 changed files with 382 additions and 403 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
perl-incfix.diff
View File

@@ -1,25 +1,22 @@
Index: perl.c
===================================================================
--- perl.c.orig
+++ perl.c
@@ -4579,11 +4579,13 @@ S_init_perllib(pTHX)
# endif
--- ./perl_inc_macro.h.orig 2018-09-22 22:08:14.492755509 +0200
+++ ./perl_inc_macro.h 2018-09-22 22:07:36.049972877 +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
S_incpush_use_sep(aTHX_ STR_WITH_LEN(PERL_OTHERLIBDIRS),
INCPUSH_ADD_VERSIONED_SUB_DIRS|INCPUSH_NOT_BASEDIR
|INCPUSH_CAN_RELOCATE);
# 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
if (!TAINTING_get) {
#ifndef VMS
@@ -4625,20 +4627,19 @@ S_init_perllib(pTHX)
/* submacros for INCPUSH_PERL5LIB */
@@ -133,19 +135,19 @@
#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),
# 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
@@ -27,16 +24,15 @@ Index: perl.c
#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),
# 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
S_incpush_use_sep(aTHX_ STR_WITH_LEN(PERL_OTHERLIBDIRS),
- INCPUSH_ADD_OLD_VERS|INCPUSH_ADD_ARCHONLY_SUB_DIRS
- |INCPUSH_CAN_RELOCATE);
# 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
#endif /* !PERL_IS_MINIPERL */