OpenPKG Specs: openpkg/perl.patch@f71e028eb3e2 (annotated)

openpkg/perl.patch@f71e028eb3e2 (annotated)

openpkg/perl.patch

Sun, 03 Apr 2011 13:34:55 +0200

author: Michael Schloh von Bennewitz <michael@schloh.com>
date: Sun, 03 Apr 2011 13:34:55 +0200
changeset 337: f71e028eb3e2
parent 13: cb59d6afeb61
child 428: f880f219c566
permissions: -rw-r--r--

Correct and improve several packaging aspects including...
Correct datadir path for python modules, correct jar(1) path for
building libgcj classes, strip libexecdir path of version numbers,
improve name of oblbld build path, clean whitespace from as(1) and
ld(1) GNU detection, remove seemingly discarded '--with-local-prefix'
configure argument, and correct hardcoded lto plugin libtool archive
dependency information.

Most importantly, correct IA32 architecture detection logic in
config.gcc to correctly emit SSE2 instructions conditionally, leading
to the removal of all '-march' bootstrap options and replacement with
unconditional (for IA32/AMD64) '-mtune=native' options. Comments and
buildtime warnings are corrected appropriately. In theory these changes
cause a more portable, orthoganal, and optimal bootstrap to be built.

 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.
 Index: installperl
 --- installperl.orig	2006-08-15 14:37:41 +0200
 +++ installperl	2006-08-18 21:05:05 +0200
@@ -211,6 +211,8 @@
  my $installarchlib = "$destdir$Config{installarchlib}";
  my $installsitelib = "$destdir$Config{installsitelib}";
  my $installsitearch = "$destdir$Config{installsitearch}";
 +my $installvendorlib = "$destdir$Config{installvendorlib}";
 +my $installvendorarch = "$destdir$Config{installvendorarch}";
  my $installman1dir = "$destdir$Config{installman1dir}";
  my $man1ext = $Config{man1ext};
  my $libperl = $Config{libperl};
@@ -372,6 +374,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, '.');
 -----------------------------------------------------------------------------
 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".
 Index: perl.c
 --- perl.c.orig	2006-08-15 14:37:41 +0200
 +++ perl.c	2006-08-18 21:08:14 +0200
@@ -4753,39 +4753,6 @@
      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;
 -    	SV * privdir = newSV(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, 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, TRUE, FALSE);
 -
 -   	SvREFCNT_dec(privdir);
 -    }
 -    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
       * DLL-based path intuition to work correctly */
@@ -4828,6 +4795,39 @@
      incpush(PERL_VENDORLIB_STEM, FALSE, TRUE, TRUE, TRUE);
  #endif
 +#ifdef ARCHLIB_EXP
 +    incpush(ARCHLIB_EXP, FALSE, FALSE, TRUE, TRUE);
 +#endif
 +#ifdef MACOS_TRADITIONAL
 +    {
 +	Stat_t tmpstatbuf;
 +    	SV * privdir = newSV(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, 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, TRUE, FALSE);
 +
 +   	SvREFCNT_dec(privdir);
 +    }
 +    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 PERL_OTHERLIBDIRS
      incpush(PERL_OTHERLIBDIRS, TRUE, TRUE, TRUE, TRUE);
  #endif
 -----------------------------------------------------------------------------
 Port to [Open]Darwin 6.6.2:
 . In OpenPKG, Perl does not use the vendor GCC and our GCC does not
    understand "-no-cpp-precomp", so remove this build option.
 . The <sys/mman.h> indirectly includes system specific headers
    which in turn have fields named "environ" while Perl uses
    a define of "environ" internally. So wrap the inclusion.
 . Darwin 6 no longer accepts the non-standard "#import" statements,
    so replace with "#include" and circumvent some header problem
    related to the non-standard "__private_extern__" attribute.
 Index: hints/darwin.sh
 --- hints/darwin.sh.orig	2006-08-15 14:37:41 +0200
 +++ hints/darwin.sh	2006-08-18 21:05:05 +0200
@@ -120,9 +120,6 @@
    *-2147483648) ccflags="${ccflags} -DINT32_MIN_BROKEN -DINT64_MIN_BROKEN" ;;
  esac
 -# Avoid Apple's cpp precompiler, better for extensions
 -cppflags="${cppflags} -no-cpp-precomp"
 -
  # This is necessary because perl's build system doesn't
  # apply cppflags to cc compile lines as it should.
  ccflags="${ccflags} ${cppflags}"
@@ -182,8 +179,7 @@
  esac
  ldlibpthname='DYLD_LIBRARY_PATH';
 -# useshrplib=true results in much slower startup times.
 -# 'false' is the default value.  Use Configure -Duseshrplib to override.
 +useshrplib='true'
  cat > UU/archname.cbu <<'EOCBU'
  # This script UU/archname.cbu will get 'called-back' by Configure
 Index: perlio.c
 --- perlio.c.orig	2006-08-15 14:37:41 +0200
 +++ perlio.c	2006-08-18 21:05:05 +0200
@@ -472,7 +472,14 @@
  #include <unistd.h>
  #endif
  #ifdef HAS_MMAP
 +#ifdef PERL_DARWIN
 +#define environ_safe environ
 +#undef environ
  #include <sys/mman.h>
 +#define environ environ_safe
 +#else
 +#include <sys/mman.h>
 +#endif
  #endif
  void
 -----------------------------------------------------------------------------
 Port to Tru64 5.1:
 Under Tru64 our gcc has to be built without binutils and the system
 ld(1) does not accept a "-O" option, so remove the whole passing of
 optimization flags to ld(1). Under a brain-dead platform like Tru64 we
 really don't need any more optimization because we are already happy if
 it works at all.
 Index: hints/dec_osf.sh
 --- hints/dec_osf.sh.orig	2007-12-18 11:47:07 +0100
 +++ hints/dec_osf.sh	2007-12-19 12:31:37 +0100
@@ -73,15 +73,6 @@
  *)            if $test "X$optimize" = "X$undef"; then
                        lddlflags="$lddlflags -msym"
                else
 -		  case "$myosvers" in
 -		  *4.0D*)
 -		      # QAR 56761: -O4 + .so may produce broken code,
 -		      # fixed in 4.0E or better.
 -		      ;;
 -		  *)
 -                      lddlflags="$lddlflags $optimize"
 -		      ;;
 -		  esac
  		  # -msym: If using a sufficiently recent /sbin/loader,
  		  # keep the module symbols with the modules.
                    lddlflags="$lddlflags -msym $_lddlflags_strict_ansi"
 -----------------------------------------------------------------------------
 Index: Configure
 --- Configure.orig	2006-08-15 14:37:40 +0200
 +++ Configure	2006-08-18 21:05:05 +0200
@@ -7871,7 +7871,7 @@
  			      ;;
  			linux|irix*|gnu*)  dflt="-shared $optimize" ;;
  			next)  dflt='none' ;;
 -			solaris) dflt='-G' ;;
 +			solaris) dflt='-shared' ;;
  			sunos) dflt='-assert nodefinitions' ;;
  			svr4*|esix*|nonstopux) dflt="-G $ldflags" ;;
  	        *)     dflt='none' ;;
 -----------------------------------------------------------------------------
 Security Fix (CVE-2005-3962, OpenPKG-SA-2005.025-perl)
 Index: sv.c
 --- sv.c.orig	2006-08-15 14:37:41 +0200
 +++ sv.c	2006-08-18 21:05:05 +0200
@@ -8667,7 +8667,10 @@
  	if ( (width = expect_number(&q)) ) {
  	    if (*q == '$') {
  		++q;
 -		efix = width;
 +		if (width > PERL_INT_MAX)
 +		    efix = PERL_INT_MAX;
 +		else
 +		    efix = width;
  	    } else {
  		goto gotwidth;
  	    }
 -----------------------------------------------------------------------------
 Corrections for Solaris 11:
 Index: perl.h
 diff -Nau perl.h.orig perl.h
 --- perl.h.orig	2007-12-18 11:47:08.000000000 +0100
 +++ perl.h	2009-01-06 15:28:45.843276063 +0100
@@ -1393,6 +1393,7 @@
   */
  #if defined(I_SYSMODE) && !defined(PERL_MICRO)
 +#include <sys/vnode.h>
  #include <sys/mode.h>
  #endif

OpenPKG Specs / annotate

openpkg/perl.patch@f71e028eb3e2 (annotated)

openpkg/perl.patch