[csw-devel] SF.net SVN: gar:[12195] csw/mgar/pkg/perl/trunk

[bonivart at users.sourceforge.net]

Revision: 12195
          http://gar.svn.sourceforge.net/gar/?rev=12195&view=rev
Author:   bonivart
Date:     2011-01-05 17:41:24 +0000 (Wed, 05 Jan 2011)

Log Message:
-----------
perl: try modifying INC to site, vendor, built in

Modified Paths:
--------------
    csw/mgar/pkg/perl/trunk/Makefile

Added Paths:
-----------
    csw/mgar/pkg/perl/trunk/files/0001-change-inc-based-on-rhel5-patch.patch

Modified: csw/mgar/pkg/perl/trunk/Makefile
===================================================================
--- csw/mgar/pkg/perl/trunk/Makefile	2011-01-05 17:22:40 UTC (rev 12194)
+++ csw/mgar/pkg/perl/trunk/Makefile	2011-01-05 17:41:24 UTC (rev 12195)
@@ -28,7 +28,13 @@
 
 LICENSE = Copying
 
+PATCHFILES += 0001-change-inc-based-on-rhel5-patch.patch
+
 CHECKPKG_OVERRIDES_CSWperldoc += surplus-dependency|CSWperl
+CHECKPKG_OVERRIDES_CSWperldoc += file-collision
+CHECKPKG_OVERRIDES_CSWperl += shared-lib-pkgname-mismatch|file=opt/csw/lib/libperl.so.5.10.1|soname=libperl.so.5.10.1|pkgname=CSWperl|expected=CSWlibperl5-10-1
+CHECKPKG_OVERRIDES_CSWperl += soname-not-found|libgdbm.so.3|is|needed|by|opt/csw/lib/perl/5.10.1/auto/GDBM_File/GDBM_File.so
+CHECKPKG_OVERRIDES_CSWperl += surplus-dependency|CSWgdbm
 
 # Core module updates
 #MASTER_SITES  += $(CPAN_FIRST_MIRROR)/S/SM/SMUELLER/

Added: csw/mgar/pkg/perl/trunk/files/0001-change-inc-based-on-rhel5-patch.patch
===================================================================
--- csw/mgar/pkg/perl/trunk/files/0001-change-inc-based-on-rhel5-patch.patch	                        (rev 0)
+++ csw/mgar/pkg/perl/trunk/files/0001-change-inc-based-on-rhel5-patch.patch	2011-01-05 17:41:24 UTC (rev 12195)
@@ -0,0 +1,60 @@
+From 621b2f69f661118c3f35bed411259d08cc984a20 Mon Sep 17 00:00:00 2001
+From: Peter Bonivart <bonivart at opencsw.org>
+Date: Wed, 5 Jan 2011 17:57:25 +0100
+Subject: [PATCH] change-inc-based-on-rhel5-patch
+
+---
+ perl.c |   23 ++++++++++++-----------
+ 1 files changed, 12 insertions(+), 11 deletions(-)
+
+diff --git a/perl.c b/perl.c
+index 94f2b13..a29dcc3 100644
+--- a/perl.c
++++ b/perl.c
+@@ -4879,9 +4879,6 @@ S_init_perllib(pTHX)
+     incpush(APPLLIB_EXP, TRUE, TRUE, TRUE, TRUE);
+ #endif
+ 
+-#ifdef ARCHLIB_EXP
+-    incpush(ARCHLIB_EXP, FALSE, FALSE, TRUE, TRUE);
+-#endif
+ #ifdef MACOS_TRADITIONAL
+     {
+ 	Stat_t tmpstatbuf;
+@@ -4903,14 +4900,6 @@ S_init_perllib(pTHX)
+     if (!PL_tainting)
+ 	incpush(":", FALSE, FALSE, TRUE, FALSE);
+ #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, TRUE);
+-#else
+-    incpush(PRIVLIB_EXP, FALSE, FALSE, TRUE, TRUE);
+-#endif
+ 
+ #ifdef SITEARCH_EXP
+     /* sitearch is always relative to sitelib on Windows for
+@@ -4958,6 +4947,18 @@ S_init_perllib(pTHX)
+     incpush(PERL_OTHERLIBDIRS, TRUE, TRUE, TRUE, TRUE);
+ #endif
+ 
++#ifdef ARCHLIB_EXP
++    incpush(ARCHLIB_EXP, FALSE, FALSE, TRUE, TRUE);
++#endif
++#ifndef PRIVLIB_EXP
++#  define PRIVLIB_EXP "/usr/local/lib/perl5:/usr/local/lib/perl"
++#endif
++#if defined(WIN32)
++    incpush(PRIVLIB_EXP, TRUE, FALSE, TRUE, TRUE);
++#else
++    incpush(PRIVLIB_EXP, FALSE, FALSE, TRUE, TRUE);
++#endif
++
+     if (!PL_tainting)
+ 	incpush(".", FALSE, FALSE, TRUE, FALSE);
+ #endif /* MACOS_TRADITIONAL */
+-- 
+1.7.3.2
+


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.