[packages/perl.git] / perl_581-INC.patch

--- perl-5.8.1/perl.c.orig	Fri Aug 22 12:30:22 2003
+++ perl-5.8.1/perl.c	Fri Aug 22 12:32:51 2003
@@ -3937,39 +3937,6 @@
     incpush(APPLLIB_EXP, TRUE, TRUE, TRUE);
 #endif
 
-#ifdef ARCHLIB_EXP
-    incpush(ARCHLIB_EXP, FALSE, FALSE, TRUE);
-#endif
-#ifdef MACOS_TRADITIONAL
-    {
-	Stat_t tmpstatbuf;
-    	SV * privdir = NEWSV(55, 0);
-	char * macperl = PerlEnv_getenv("MACPERL");
-	
-	if (!macperl)
-	    macperl = "";
-	
-	Perl_sv_setpvf(aTHX_ privdir, "%slib:", macperl);
-	if (PerlLIO_stat(SvPVX(privdir), &tmpstatbuf) >= 0 && S_ISDIR(tmpstatbuf.st_mode))
-	    incpush(SvPVX(privdir), TRUE, FALSE, TRUE);
-	Perl_sv_setpvf(aTHX_ privdir, "%ssite_perl:", macperl);
-	if (PerlLIO_stat(SvPVX(privdir), &tmpstatbuf) >= 0 && S_ISDIR(tmpstatbuf.st_mode))
-	    incpush(SvPVX(privdir), TRUE, FALSE, TRUE);
-	
-   	SvREFCNT_dec(privdir);
-    }
-    if (!PL_tainting)
-	incpush(":", FALSE, FALSE, TRUE);
-#else
-#ifndef PRIVLIB_EXP
-#  define PRIVLIB_EXP "/usr/local/lib/perl5:/usr/local/lib/perl"
-#endif
-#if defined(WIN32)
-    incpush(PRIVLIB_EXP, TRUE, FALSE, TRUE);
-#else
-    incpush(PRIVLIB_EXP, FALSE, FALSE, TRUE);
-#endif
-
 #ifdef SITEARCH_EXP
     /* sitearch is always relative to sitelib on Windows for
      * DLL-based path intuition to work correctly */
@@ -3988,7 +3955,7 @@
 #endif
 
 #ifdef SITELIB_STEM /* Search for version-specific dirs below here */
-    incpush(SITELIB_STEM, FALSE, TRUE, TRUE);
+/*  incpush(SITELIB_STEM, FALSE, TRUE, TRUE); */
 #endif
 
 #ifdef PERL_VENDORARCH_EXP
@@ -4008,7 +3975,40 @@
 #endif
 
 #ifdef PERL_VENDORLIB_STEM /* Search for version-specific dirs below here */
-    incpush(PERL_VENDORLIB_STEM, FALSE, TRUE, TRUE);
+/*  incpush(PERL_VENDORLIB_STEM, FALSE, TRUE, TRUE); */
+#endif
+
+#ifdef ARCHLIB_EXP
+    incpush(ARCHLIB_EXP, FALSE, FALSE, TRUE);
+#endif
+#ifdef MACOS_TRADITIONAL
+    {
+	Stat_t tmpstatbuf;
+    	SV * privdir = NEWSV(55, 0);
+	char * macperl = PerlEnv_getenv("MACPERL");
+	
+	if (!macperl)
+	    macperl = "";
+	
+	Perl_sv_setpvf(aTHX_ privdir, "%slib:", macperl);
+	if (PerlLIO_stat(SvPVX(privdir), &tmpstatbuf) >= 0 && S_ISDIR(tmpstatbuf.st_mode))
+	    incpush(SvPVX(privdir), TRUE, FALSE, TRUE);
+	Perl_sv_setpvf(aTHX_ privdir, "%ssite_perl:", macperl);
+	if (PerlLIO_stat(SvPVX(privdir), &tmpstatbuf) >= 0 && S_ISDIR(tmpstatbuf.st_mode))
+	    incpush(SvPVX(privdir), TRUE, FALSE, TRUE);
+	
+   	SvREFCNT_dec(privdir);
+    }
+    if (!PL_tainting)
+	incpush(":", FALSE, FALSE, TRUE);
+#else
+#ifndef PRIVLIB_EXP
+#  define PRIVLIB_EXP "/usr/local/lib/perl5:/usr/local/lib/perl"
+#endif
+#if defined(WIN32)
+    incpush(PRIVLIB_EXP, TRUE, FALSE, TRUE);
+#else
+    incpush(PRIVLIB_EXP, FALSE, FALSE, TRUE);
 #endif
 
 #ifdef PERL_OTHERLIBDIRS
Commit	Line	Data
1a802cc7	1	--- perl-5.8.1/perl.c.orig Fri Aug 22 12:30:22 2003
	2	+++ perl-5.8.1/perl.c Fri Aug 22 12:32:51 2003
	3	@@ -3937,39 +3937,6 @@
3677dc59	4	incpush(APPLLIB_EXP, TRUE, TRUE, TRUE);
642838fa	5	#endif
3677dc59	6
	7	-#ifdef ARCHLIB_EXP
	8	- incpush(ARCHLIB_EXP, FALSE, FALSE, TRUE);
	9	-#endif
642838fa	10	-#ifdef MACOS_TRADITIONAL
	11	- {
	12	- Stat_t tmpstatbuf;
	13	- SV * privdir = NEWSV(55, 0);
	14	- char * macperl = PerlEnv_getenv("MACPERL");
	15	-
	16	- if (!macperl)
	17	- macperl = "";
	18	-
	19	- Perl_sv_setpvf(aTHX_ privdir, "%slib:", macperl);
	20	- if (PerlLIO_stat(SvPVX(privdir), &tmpstatbuf) >= 0 && S_ISDIR(tmpstatbuf.st_mode))
	21	- incpush(SvPVX(privdir), TRUE, FALSE, TRUE);
	22	- Perl_sv_setpvf(aTHX_ privdir, "%ssite_perl:", macperl);
	23	- if (PerlLIO_stat(SvPVX(privdir), &tmpstatbuf) >= 0 && S_ISDIR(tmpstatbuf.st_mode))
	24	- incpush(SvPVX(privdir), TRUE, FALSE, TRUE);
	25	-
	26	- SvREFCNT_dec(privdir);
	27	- }
	28	- if (!PL_tainting)
	29	- incpush(":", FALSE, FALSE, TRUE);
	30	-#else
	31	-#ifndef PRIVLIB_EXP
	32	-# define PRIVLIB_EXP "/usr/local/lib/perl5:/usr/local/lib/perl"
	33	-#endif
	34	-#if defined(WIN32)
	35	- incpush(PRIVLIB_EXP, TRUE, FALSE, TRUE);
	36	-#else
	37	- incpush(PRIVLIB_EXP, FALSE, FALSE, TRUE);
	38	-#endif
3677dc59	39	-
642838fa	40	#ifdef SITEARCH_EXP
642838fa	41	/* sitearch is always relative to sitelib on Windows for
3677dc59	42	* DLL-based path intuition to work correctly */
1a802cc7	43	@@ -3988,7 +3955,7 @@
642838fa	44	#endif
	45
	46	#ifdef SITELIB_STEM /* Search for version-specific dirs below here */
	47	- incpush(SITELIB_STEM, FALSE, TRUE, TRUE);
	48	+/* incpush(SITELIB_STEM, FALSE, TRUE, TRUE); */
	49	#endif
	50
	51	#ifdef PERL_VENDORARCH_EXP
1a802cc7	52	@@ -4008,7 +3975,40 @@
642838fa	53	#endif
	54
	55	#ifdef PERL_VENDORLIB_STEM /* Search for version-specific dirs below here */
	56	- incpush(PERL_VENDORLIB_STEM, FALSE, TRUE, TRUE);
	57	+/* incpush(PERL_VENDORLIB_STEM, FALSE, TRUE, TRUE); */
	58	+#endif
	59	+
3677dc59	60	+#ifdef ARCHLIB_EXP
	61	+ incpush(ARCHLIB_EXP, FALSE, FALSE, TRUE);
	62	+#endif
642838fa	63	+#ifdef MACOS_TRADITIONAL
	64	+ {
	65	+ Stat_t tmpstatbuf;
	66	+ SV * privdir = NEWSV(55, 0);
	67	+ char * macperl = PerlEnv_getenv("MACPERL");
	68	+
	69	+ if (!macperl)
	70	+ macperl = "";
	71	+
	72	+ Perl_sv_setpvf(aTHX_ privdir, "%slib:", macperl);
	73	+ if (PerlLIO_stat(SvPVX(privdir), &tmpstatbuf) >= 0 && S_ISDIR(tmpstatbuf.st_mode))
	74	+ incpush(SvPVX(privdir), TRUE, FALSE, TRUE);
	75	+ Perl_sv_setpvf(aTHX_ privdir, "%ssite_perl:", macperl);
	76	+ if (PerlLIO_stat(SvPVX(privdir), &tmpstatbuf) >= 0 && S_ISDIR(tmpstatbuf.st_mode))
	77	+ incpush(SvPVX(privdir), TRUE, FALSE, TRUE);
	78	+
	79	+ SvREFCNT_dec(privdir);
	80	+ }
	81	+ if (!PL_tainting)
	82	+ incpush(":", FALSE, FALSE, TRUE);
	83	+#else
	84	+#ifndef PRIVLIB_EXP
	85	+# define PRIVLIB_EXP "/usr/local/lib/perl5:/usr/local/lib/perl"
	86	+#endif
	87	+#if defined(WIN32)
	88	+ incpush(PRIVLIB_EXP, TRUE, FALSE, TRUE);
	89	+#else
	90	+ incpush(PRIVLIB_EXP, FALSE, FALSE, TRUE);
	91	#endif
	92
	93	#ifdef PERL_OTHERLIBDIRS