- added fix-h2ph-and-test patch, fixes: perl -e 'require "_h2ph_pre.ph";'

[packages/perl.git] / perl_585-microperl_uconfig.patch

diff --git a/perl_585-microperl_uconfig.patch b/perl_585-microperl_uconfig.patch
index a731d80c334c7d12a7fd2ffe41120261180e97cc..d75492831375bf097e6545b5a9c1a78cd597a18b 100644 (file)
--- a/perl_585-microperl_uconfig.patch
+++ b/perl_585-microperl_uconfig.patch
@@ -1,38 +1,11 @@
-diff -urN perl-5.10.0.org/Makefile.micro perl-5.10.0/Makefile.micro
---- perl-5.10.0.org/Makefile.micro     2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/Makefile.micro 2008-01-09 14:22:14.801222180 +0100
-@@ -39,6 +39,12 @@
- 
- distclean:    clean
- 
-+# not really autoconfigured variables (PLD hack, requires patched uconfig.sh)
-+NRACV = archlib=$(archlib) archlibexp=$(archlibexp) privlib=$(privlib) \
-+      privlibexp=$(privlibexp) archname=$(archname) osname=$(osname) \
-+      bin=$(bin) scriptdir=$(scriptdir) scriptdirexp=$(scriptdirexp) \
-+      usemallocwrap=$(usemallocwrap)
-+
- # The microconfiguration.
- 
- # Cannot use $$ in the command line itself, so using var expansion instead.
-@@ -47,7 +53,9 @@
-       $(PERL) -MConfig -pi -e "s/^((?:short|int|long(?:dbl|long)?|ptr|double|[iun]v|u?quad|[iu]\d+|fpos|lseek)(?:size|type)|byteorder|d_quad|quadkind|use64.+)=.*/\\1='"$(Config)"'/g" uconfig.shx
- 
- regen_uconfig uconfig.h: uconfig.sh
--      $(ENV) CONFIG_SH=uconfig.sh CONFIG_H=uconfig.h sh ./config_h.SH
-+      $(ENV) CONFIG_SH=uconfig.sh CONFIG_H=uconfig.h $(NRACV) sh ./config_h.SH
-+
-+uconfig.h: regen_uconfig
- 
- # Do not regenerate perly.c and perly.h.
- 
---- perl-5.10.1/uconfig.sh.orig        2009-08-25 08:37:36.000000000 +0200
-+++ perl-5.10.1/uconfig.sh     2009-08-25 08:43:07.000000000 +0200
+--- perl-5.12.0/uconfig.sh.orig        2010-03-14 22:15:34.000000000 +0100
++++ perl-5.12.0/uconfig.sh     2010-04-13 18:38:00.353231241 +0200
 @@ -5,12 +5,7 @@
  afsroot='/afs'
  alignbytes='4'
  aphostname='/bin/hostname'
--archlib='/usr/local/lib/perl5/5.11/unknown'
--archlibexp='/usr/local/lib/perl5/5.11/unknown'
+-archlib='/usr/local/lib/perl5/5.12/unknown'
+-archlibexp='/usr/local/lib/perl5/5.12/unknown'
 -archname='unknown'
  asctime_r_proto='0'
 -bin='/usr/local/bin'
@@ -40,7 +13,7 @@ diff -urN perl-5.10.0.org/Makefile.micro perl-5.10.0/Makefile.micro
  byteorder='1234'
  castflags='0'
  cf_by='root@localhost'
-@@ -43,7 +38,7 @@
+@@ -44,7 +39,7 @@
  d_accessx='undef'
  d_aintl='undef'
  d_alarm='undef'
@@ -49,7 +22,7 @@ diff -urN perl-5.10.0.org/Makefile.micro perl-5.10.0/Makefile.micro
  d_asctime64='undef'
  d_asctime_r='undef'
  d_atolf='undef'
-@@ -232,7 +227,7 @@
+@@ -233,7 +228,7 @@
  d_libm_lib_version='undef'
  d_link='undef'
  d_localtime64='undef'
@@ -58,7 +31,7 @@ diff -urN perl-5.10.0.org/Makefile.micro perl-5.10.0/Makefile.micro
  d_localtime_r='undef'
  d_locconv='undef'
  d_lockf='undef'
-@@ -661,14 +656,10 @@
+@@ -662,14 +657,10 @@
  old_pthread_create_joinable=''
  optimize='-O2'
  orderlib='false'
@@ -68,12 +41,12 @@ diff -urN perl-5.10.0.org/Makefile.micro perl-5.10.0/Makefile.micro
  package='perl5'
  phostname='hostname'
  pidtype=int
--privlib='/usr/local/lib/perl5/5.11'
--privlibexp='/usr/local/lib/perl5/5.11'
+-privlib='/usr/local/lib/perl5/5.12'
+-privlibexp='/usr/local/lib/perl5/5.12'
  procselfexe=''
  prototype='undef'
  ptrsize='4'
-@@ -699,8 +690,6 @@
+@@ -700,8 +691,6 @@
  sPRIXU64='"LX"'
  sSCNfldbl='"llf"'
  sched_yield='sched_yield()'