diff options
| author | Anton Berezin <tobez@FreeBSD.org> | 2002-06-02 21:22:25 +0000 |
|---|---|---|
| committer | Anton Berezin <tobez@FreeBSD.org> | 2002-06-02 21:22:25 +0000 |
| commit | 900f4721931b59dc6aae3fd0d33d29d48426ac5c (patch) | |
| tree | 62956cae9f47cbeb00b2643981b3884987d5b7a6 /lang/perl5.6/files/patch-perl.c | |
| parent | Add missing includes for CURRENT (diff) | |
Put SITEARCH and SITELIB paths in front of ARCHLIB and PRIVLIB in the
@INC array. This takes care of the infamous problem of updating the
packages already in the perl distribution. With this change, no tricks
are any longer necessary for such p5 ports, except the usual tweaking of
INSTALLDIRS in Makefile.PL. This last one can also be taken care of by
an appropriate BSDPAN modifications, but until we have the `natural'
@INC order in the 4.X base system perl, it is meaningless.
Do not include iconv.h and do not link with libiconv. Iconv is not used
by perl in any way currently, but it used to link it if found.
Fix perl on freebsd/sparc64.
PR: 33212 (iconv), 37605 (iconv), 38813 (sparc64)
Reported by: Vivek Khera <khera@kciLink.com> (iconv),
Martin Nilsson <martin@gneto.com> (iconv)
Submitted by: jake (sparc64)
Notes
Notes:
svn path=/head/; revision=60490
Diffstat (limited to 'lang/perl5.6/files/patch-perl.c')
| -rw-r--r-- | lang/perl5.6/files/patch-perl.c | 58 |
1 files changed, 58 insertions, 0 deletions
diff --git a/lang/perl5.6/files/patch-perl.c b/lang/perl5.6/files/patch-perl.c new file mode 100644 index 000000000000..b9b348bef069 --- /dev/null +++ b/lang/perl5.6/files/patch-perl.c @@ -0,0 +1,58 @@ +$FreeBSD$ + +--- perl.c.orig Sun Jun 2 12:29:01 2002 ++++ perl.c Sun Jun 2 12:30:14 2002 +@@ -3407,6 +3407,26 @@ + #endif /* VMS */ + } + ++#ifdef SITEARCH_EXP ++ /* sitearch is always relative to sitelib on Windows for ++ * DLL-based path intuition to work correctly */ ++# if !defined(WIN32) ++ incpush(SITEARCH_EXP, FALSE, FALSE); ++# endif ++#endif ++ ++#ifdef SITELIB_EXP ++# if defined(WIN32) ++ incpush(SITELIB_EXP, TRUE, FALSE); /* this picks up sitearch as well */ ++# else ++ incpush(SITELIB_EXP, FALSE, FALSE); ++# endif ++#endif ++ ++#ifdef SITELIB_STEM /* Search for version-specific dirs below here */ ++ incpush(SITELIB_STEM, FALSE, TRUE); ++#endif ++ + /* Use the ~-expanded versions of APPLLIB (undocumented), + ARCHLIB PRIVLIB SITEARCH SITELIB VENDORARCH and VENDORLIB + */ +@@ -3445,26 +3465,6 @@ + incpush(PRIVLIB_EXP, TRUE, FALSE); + #else + incpush(PRIVLIB_EXP, FALSE, FALSE); +-#endif +- +-#ifdef SITEARCH_EXP +- /* sitearch is always relative to sitelib on Windows for +- * DLL-based path intuition to work correctly */ +-# if !defined(WIN32) +- incpush(SITEARCH_EXP, FALSE, FALSE); +-# endif +-#endif +- +-#ifdef SITELIB_EXP +-# if defined(WIN32) +- incpush(SITELIB_EXP, TRUE, FALSE); /* this picks up sitearch as well */ +-# else +- incpush(SITELIB_EXP, FALSE, FALSE); +-# endif +-#endif +- +-#ifdef SITELIB_STEM /* Search for version-specific dirs below here */ +- incpush(SITELIB_STEM, FALSE, TRUE); + #endif + + #ifdef PERL_VENDORARCH_EXP |