--- App-Staticperl/staticperl.sh	2010/12/28 18:03:47	1.25
+++ App-Staticperl/staticperl.sh	2011/03/13 23:20:21	1.36
@@ -9,10 +9,10 @@
 
 # perl build variables
 MAKE=make
-PERL_VERSION=5.12.2 # 5.8.9 is also a good choice
+PERL_VERSION=5.12.3 # 5.8.9 is also a good choice
 PERL_CC=cc
 PERL_CONFIGURE="" # additional Configure arguments
-PERL_CCFLAGS="-DPERL_DISABLE_PMC -DPERL_ARENA_SIZE=65536 -D_GNU_SOURCE -DNDEBUG"
+PERL_CCFLAGS="-g -DPERL_DISABLE_PMC -DPERL_ARENA_SIZE=16376 -DNO_PERL_MALLOC_ENV -D_GNU_SOURCE -DNDEBUG"
 PERL_OPTIMIZE="-Os -ffunction-sections -fdata-sections -finline-limit=8 -ffast-math"
 
 ARCH="$(uname -m)"
@@ -73,7 +73,7 @@
 
 # set version in a way that Makefile.PL can extract
 VERSION=VERSION; eval \
-$VERSION=0.92
+$VERSION="1.2"
 
 BZ2=bz2
 BZIP2=bzip2
@@ -167,8 +167,8 @@
 
       mkdir -p unpack
       rm -rf unpack/perl-$PERL_VERSION
-      $BZIP2 -d <perl-$PERL_VERSION.tar.bz2 | tar xfC - unpack \
-         || fatal "perl-$PERL_VERSION.tar.bz2: error during unpacking"
+      $BZIP2 -d <perl-$PERL_VERSION.tar.$BZ2 | ( cd unpack && tar x ) \
+         || fatal "perl-$PERL_VERSION.tar.$BZ2: error during unpacking"
       chmod -R u+w unpack/perl-$PERL_VERSION
       mv unpack/perl-$PERL_VERSION perl-$PERL_VERSION
       rmdir -p unpack
@@ -241,6 +241,7 @@
                 -Uusemultiplicity \
                 -Uusesfio \
                 -Uuseshrplib \
+                -Uinstallusrbinperl \
                 -A ccflags=" $PERL_CCFLAGS" \
                 -Dcc="$PERL_CC" \
                 -Doptimize="$PERL_OPTIMIZE" \
@@ -316,6 +317,22 @@
       cat >"$PERL_PREFIX"/bin/cpan-make-install <<EOF
 "$MAKE" || exit
 
+# patch CPAN::HandleConfig.pm
+HCPM="$PERL_PREFIX"/lib/CPAN/HandleConfig.pm
+case "\$(head -n1 "\$HCPM")" in
+   *CPAN::MyConfig* )
+      ;;
+   * )
+      echo "patching \$HCPM for a safer tomorrow"
+      {
+         echo "use CPAN::MyConfig;"
+         cat "\$HCPM"
+      } >"\$HCPM~"
+      rm -f "\$HCPM"
+      mv "\$HCPM~" "\$HCPM"
+      ;;
+esac
+
 if find blib/arch/auto -type f | grep -q -v .exists; then
    echo Probably an XS module, rebuilding perl
    if "$MAKE" perl; then
@@ -336,7 +353,11 @@
       # trick CPAN into avoiding ~/.cpan completely
       echo 1 >"$PERL_PREFIX/lib/CPAN/MyConfig.pm"
 
-      "$PERL_PREFIX"/bin/perl -MCPAN -e '
+      # we call cpan with -MCPAN::MyConfig in this script, but
+      # every make install will patch CPAN::HandleConfig.pm to
+      # protect the user.
+
+      "$PERL_PREFIX"/bin/perl -MCPAN::MyConfig -MCPAN -e '
          CPAN::Shell->o (conf => urllist => push => "'"$CPAN"'");
          CPAN::Shell->o (conf => q<cpan_home>, "'"$STATICPERL"'/cpan");
          CPAN::Shell->o (conf => q<init>);
@@ -348,6 +369,7 @@
          CPAN::Shell->o (conf => q<make_install_make_command>, "'"$PERL_PREFIX"'/bin/cpan-make-install");
          CPAN::Shell->o (conf => q<prerequisites_policy>, q<follow>);
          CPAN::Shell->o (conf => q<build_requires_install_policy>, q<no>);
+         CPAN::Shell->o (conf => q<prefer_installer>, "EUMM");
          CPAN::Shell->o (conf => q<commit>);
       ' || fatal "error while initialising CPAN"
 
@@ -377,7 +399,7 @@
 EOF
 
    for mod in "$@"; do
-      "$PERL_PREFIX"/bin/perl -MCPAN -e 'notest install => "'"$mod"'"' \
+      "$PERL_PREFIX"/bin/perl -MCPAN::MyConfig -MCPAN -e 'notest install => "'"$mod"'"' \
          || fatal "$mod: unable to install from CPAN"
    done
    rm -rf "$STATICPERL/build"