OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 03-Sep-2003 14:37:47
Branch: HEAD Handle: 2003090313374402
Modified files:
openpkg-src/perl perl.patch perl.spec
openpkg-web news.txt
Log:
1. By default, the Perl module search order is "use lib, -I, PERL[5]LIB,
perl, site, vendor, other". This means that in OpenPKG both the
modules installed via CPAN shell (in "site" area) and the "perl-xxx"
packages (in "vendor" area) cannot override the (sometimes obsoleted)
module versions distributed with Perl (in "perl" area). Hence, we
change the search order to a more reasonable one for OpenPKG: "use
lib, -I, PERL[5]LIB, site, vendor, perl, other".
2. Already activate "vendor" area, althouh it is still unused in OpenPKG.
It will be soon used by the "perl-xxx" packages to make "site" area
available for manual (think CPAN shell) module installations.
Summary:
Revision Changes Path
1.7 +120 -0 openpkg-src/perl/perl.patch
1.79 +2 -1 openpkg-src/perl/perl.spec
1.6374 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/perl/perl.patch
============================================================================
$ cvs diff -u -r1.6 -r1.7 perl.patch
--- openpkg-src/perl/perl.patch 16 Dec 2002 11:25:39 -0000 1.6
+++ openpkg-src/perl/perl.patch 3 Sep 2003 12:37:46 -0000 1.7
@@ -24,3 +24,123 @@
return Opcode::_safe_call_sv($root, $obj->{Mask}, $evalsub);
}
+-----------------------------------------------------------------------------
+
+By default, the Perl module search order is "use lib, -I, PERL[5]LIB,
+perl, site, vendor, other". This means that in OpenPKG both the modules
+installed via CPAN shell (in "site" area) and the "perl-xxx" packages
+(in "vendor" area) cannot override the (sometimes obsoleted) module
+versions distributed with Perl (in "perl" area). Hence, we change
+the search order to a more reasonable one for OpenPKG: "use lib, -I,
+PERL[5]LIB, site, vendor, perl, other".
+
+--- perl.c.orig 2002-07-09 21:41:43.000000000 +0200
++++ perl.c 2003-09-03 14:08:25.000000000 +0200
+@@ -3679,39 +3679,6 @@
+ incpush(APPLLIB_EXP, TRUE, TRUE);
+ #endif
+
+-#ifdef ARCHLIB_EXP
+- incpush(ARCHLIB_EXP, FALSE, FALSE);
+-#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);
+- 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);
+-
+- SvREFCNT_dec(privdir);
+- }
+- if (!PL_tainting)
+- incpush(":", FALSE, 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);
+-#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 */
+@@ -3752,6 +3719,39 @@
+ incpush(PERL_VENDORLIB_STEM, FALSE, TRUE);
+ #endif
+
++#ifdef ARCHLIB_EXP
++ incpush(ARCHLIB_EXP, FALSE, FALSE);
++#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);
++ 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);
++
++ SvREFCNT_dec(privdir);
++ }
++ if (!PL_tainting)
++ incpush(":", FALSE, 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);
++#else
++ incpush(PRIVLIB_EXP, FALSE, FALSE);
++#endif
++
+ #ifdef PERL_OTHERLIBDIRS
+ incpush(PERL_OTHERLIBDIRS, TRUE, TRUE);
+ #endif
+
+-----------------------------------------------------------------------------
+
+By default, the "vendor" area is not used, so Perl's installation
+procedure forgot to create its top-level paths, too. In OpenPKG we use
+the "vendor" area, so make sure it is created the same way the "site"
+area is.
+
+--- installperl.orig 2002-07-16 20:57:32.000000000 +0200
++++ installperl 2003-09-03 14:27:11.000000000 +0200
+@@ -174,6 +174,8 @@
+ my $installarchlib = $Config{installarchlib};
+ my $installsitelib = $Config{installsitelib};
+ my $installsitearch = $Config{installsitearch};
++my $installvendorlib = $Config{installvendorlib};
++my $installvendorarch = $Config{installvendorarch};
+ my $installman1dir = $Config{installman1dir};
+ my $man1ext = $Config{man1ext};
+ my $libperl = $Config{libperl};
+@@ -336,6 +338,8 @@
+ mkpath($installarchlib, $verbose, 0777);
+ mkpath($installsitelib, $verbose, 0777) if ($installsitelib);
+ mkpath($installsitearch, $verbose, 0777) if ($installsitearch);
++mkpath($installvendorlib, $verbose, 0777) if ($installvendorlib);
++mkpath($installvendorarch, $verbose, 0777) if ($installvendorarch);
+
+ if (chdir "lib") {
+ $do_installarchlib = ! samepath($installarchlib, '.');
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/perl/perl.spec
============================================================================
$ cvs diff -u -r1.78 -r1.79 perl.spec
--- openpkg-src/perl/perl.spec 23 Jul 2003 13:32:10 -0000 1.78
+++ openpkg-src/perl/perl.spec 3 Sep 2003 12:37:46 -0000 1.79
@@ -33,7 +33,7 @@
Group: Language
License: GPL/Artistic
Version: 5.8.0
-Release: 20030723
+Release: 20030903
# list of sources
Source0: ftp://ftp.cpan.org/pub/CPAN/src/perl-%{version}.tar.gz
@@ -70,6 +70,7 @@
./Configure \
-d -e -s \
-Dprefix=%{l_prefix} \
+ -Dvendorprefix=%{l_prefix} \
-Dinstallprefix=$RPM_BUILD_ROOT%{l_prefix} \
-Dcc="%{l_cc}" -Doptimize="%{l_cflags -O}" \
-Dlocincpth="%{l_prefix}/include" \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.6373 -r1.6374 news.txt
--- openpkg-web/news.txt 2 Sep 2003 17:51:44 -0000 1.6373
+++ openpkg-web/news.txt 3 Sep 2003 12:37:44 -0000 1.6374
@@ -1,3 +1,4 @@
+03-Sep-2003: Upgraded package: P<perl-5.8.0-20030903>
02-Sep-2003: Upgraded package: P<pks-0.9.6-20030902>
02-Sep-2003: Upgraded package: P<pb4sd-1.2-20030902>
02-Sep-2003: Upgraded package: P<pam-20030902-20030902>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
