--- App-Staticperl/staticperl.sh	2010/12/10 20:29:17	1.14
+++ App-Staticperl/staticperl.sh	2011/07/09 18:26:27	1.48
@@ -1,17 +1,19 @@
 #!/bin/sh
 
 #############################################################################
-# configuration to fill in
+# configuration to fill in (or to replace in your .staticperlrc)
 
 STATICPERL=~/.staticperl
 CPAN=http://mirror.netcologne.de/cpan # which mirror to use
 EMAIL="read the documentation <rtfm@example.org>"
-
+DLCACHE=
 
 # perl build variables
-PERL_VERSION=5.12.2 # 5.8.9 is also a good choice
+MAKE=make
+PERL_VERSION=5.12.3 # 5.8.9 is also a good choice
+PERL_CC=cc
 PERL_CONFIGURE="" # additional Configure arguments
-PERL_CPPFLAGS="-DPERL_DISABLE_PMC -DPERL_ARENA_SIZE=65536 -D_GNU_SOURCE -DNDEBUG -USITELIB_EXP -USITEARCHEXP -UARCHLIB_EXP"
+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)"
@@ -29,14 +31,17 @@
 
 # -Wl,--gc-sections makes it impossible to check for undefined references
 # for some reason so we need to patch away the "-no" after Configure and before make :/
-# -z muldefs is to work around uclibc's pthread static linking bug
-PERL_LDFLAGS="-Wl,--no-gc-sections -z muldefs"
+# --allow-multiple-definition exists to work around uclibc's pthread static linking bug
+#PERL_LDFLAGS="-Wl,--no-gc-sections -Wl,--allow-multiple-definition"
+PERL_LDFLAGS=
 PERL_LIBS="-lm -lcrypt" # perl loves to add lotsa crap itself
 
 # some configuration options for modules
-export PERL_MM_USE_DEFAULT=1
-#export CORO_INTERFACE=p # needed without nptl on x86, due to bugs in linuxthreads - very slow
-export EV_EXTRA_DEFS='-DEV_FEATURES=4+8+16+64 -DEV_USE_SELECT=0 -DEV_USE_POLL=1 -DEV_USE_EPOLL=1 -DEV_NO_LOOPS -DEV_COMPAT3=0'
+PERL_MM_USE_DEFAULT=1
+PERL_MM_OPT="MAN1PODS= MAN3PODS="
+#CORO_INTERFACE=p # needed without nptl on x86, due to bugs in linuxthreads - very slow
+#EV_EXTRA_DEFS='-DEV_FEATURES=4+8+16+64 -DEV_USE_SELECT=0 -DEV_USE_POLL=1 -DEV_USE_EPOLL=1 -DEV_NO_LOOPS -DEV_COMPAT3=0'
+export PERL_MM_USE_DEFAULT PERL_MM_OPT
 
 # which extra modules to install by default from CPAN that are
 # required by mkbundle
@@ -47,6 +52,7 @@
 
 # overridable functions
 preconfigure()  { : ; }
+patchconfig()   { : ; }
 postconfigure() { : ; }
 postbuild()     { : ; }
 postinstall()   { : ; }
@@ -63,15 +69,19 @@
 #############################################################################
 # support
 
-MKBUNDLE="${MKBUNDLE:=$STATICPERL/mkbundle}"
 PERL_PREFIX="${PERL_PREFIX:=$STATICPERL/perl}" # where the perl gets installed
 
-unset PERL5OPT PERL5LIB PERLLIB PERL_UNICODE PERLIO_DEBUG 
-export LC_ALL=C # just to be on the safe side
+unset PERL5OPT PERL5LIB PERLLIB PERL_UNICODE PERLIO_DEBUG
+unset PERL_MB_OPT
+LC_ALL=C; export LC_ALL # just to be on the safe side
+
+# prepend PATH - not required by staticperl itself, but might make
+# life easier when working in e.g. "staticperl cpan / look"
+PATH="$PERL_PREFIX/perl/bin:$PATH"
 
 # set version in a way that Makefile.PL can extract
 VERSION=VERSION; eval \
-$VERSION=0.9
+$VERSION="1.31"
 
 BZ2=bz2
 BZIP2=bzip2
@@ -124,7 +134,13 @@
 # download/configure/compile/install perl
 
 clean() {
-   rm -rf "$STATICPERL/src/perl-$PERL_VERSION"
+   rm -rf "$STATICPERL/src"
+}
+
+realclean() {
+   rm -f "$PERL_PREFIX/staticstamp.postinstall"
+   rm -f "$PERL_PREFIX/staticstamp.install"
+   rm -f "$STATICPERL/src/perl-"*"/staticstamp.configure"
 }
 
 fetch() {
@@ -134,22 +150,36 @@
    rcd src
 
    if ! [ -d "perl-$PERL_VERSION" ]; then
-      if ! [ -e "perl-$PERL_VERSION.tar.$BZ2" ]; then
+      PERLTAR=perl-$PERL_VERSION.tar.$BZ2
 
-         URL="$CPAN/src/5.0/perl-$PERL_VERSION.tar.$BZ2"
+      if ! [ -e $PERLTAR ]; then
+         URL="$CPAN/src/5.0/$PERLTAR"
 
          verblock <<EOF
 downloading perl
 to manually download perl yourself, place
 perl-$PERL_VERSION.tar.$BZ2 in $STATICPERL
 trying $URL
+
+either curl or wget is required for automatic download.
+curl is tried first, then wget.
+
+you can configure a download cache directory via DLCACHE
+in your .staticperlrc to avoid repeated downloads.
 EOF
 
-         rm -f perl-$PERL_VERSION.tar.$BZ2~ # just to be on the safe side
-         wget -O perl-$PERL_VERSION.tar.$BZ2~ "$URL" \
-            || curl >perl-$PERL_VERSION.tar.$BZ2~ "$URL" \
+         rm -f $PERLTAR~ # just to be on the safe side
+         { [ "$DLCACHE" ] && cp "$DLCACHE"/$PERLTAR $PERLTAR~ >/dev/null 2>&1; } \
+            || wget -O $PERLTAR~ "$URL" \
+            || curl -f >$PERLTAR~ "$URL" \
             || fatal "$URL: unable to download"
-         mv perl-$PERL_VERSION.tar.$BZ2~ perl-$PERL_VERSION.tar.$BZ2
+         rm -f $PERLTAR
+         mv $PERLTAR~ $PERLTAR
+         if [ "$DLCACHE" ]; then
+            mkdir -p "$DLCACHE"
+            cp $PERLTAR "$DLCACHE"/$PERLTAR~ && \
+               mv "$DLCACHE"/$PERLTAR~ "$DLCACHE"/$PERLTAR
+         fi
       fi
 
       verblock <<EOF
@@ -157,8 +187,9 @@
 EOF
 
       mkdir -p unpack
-      $BZIP2 -d <perl-$PERL_VERSION.tar.bz2 | tar xfC - unpack \
-         || fatal "perl-$PERL_VERSION.tar.bz2: error during unpacking"
+      rm -rf unpack/perl-$PERL_VERSION
+      $BZIP2 -d <$PERLTAR | ( cd unpack && tar xf - ) \
+         || fatal "$PERLTAR: error during unpacking"
       chmod -R u+w unpack/perl-$PERL_VERSION
       mv unpack/perl-$PERL_VERSION perl-$PERL_VERSION
       rmdir -p unpack
@@ -168,9 +199,36 @@
 # similar to GNU-sed -i or perl -pi
 sedreplace() {
    sed -e "$1" <"$2" > "$2~" || fatal "error while running sed"
+   rm -f "$2"
    mv "$2~" "$2"
 }
 
+configure_failure() {
+   cat <<EOF
+
+
+*** 
+*** Configure failed - see above for the exact error message(s).
+*** 
+*** Most commonly, this is because the default PERL_CCFLAGS or PERL_OPTIMIZE
+*** flags are not supported by your compiler. Less often, this is because
+*** PERL_LIBS either contains a library not available on your system (such as
+*** -lcrypt), or because it lacks a required library (e.g. -lsocket or -lnsl).
+*** 
+*** You can provide your own flags by creating a ~/.staticperlrc file with
+*** variable assignments. For example (these are the actual values used):
+***
+
+PERL_CC="$PERL_CC"
+PERL_CCFLAGS="$PERL_CCFLAGS"
+PERL_OPTIMIZE="$PERL_OPTIMIZE"
+PERL_LDFLAGS="$PERL_LDFLAGS"
+PERL_LIBS="$PERL_LIBS"
+
+EOF
+   exit 1
+}
+
 configure() {
    fetch
 
@@ -184,13 +242,19 @@
 
    rm -f "$PERL_PREFIX/staticstamp.install"
 
-   make distclean >/dev/null 2>&1
+   "$MAKE" distclean >/dev/null 2>&1
+
+   sedreplace '/^#define SITELIB/d' config_h.SH
 
-   # I hate them
+   # I hate them for this
    grep -q -- -fstack-protector Configure && \
       sedreplace 's/-fstack-protector/-fno-stack-protector/g' Configure
 
-   preconfigure
+   # what did that bloke think
+   grep -q -- usedl=.define hints/darwin.sh && \
+      sedreplace '/^usedl=.define.;$/d' hints/darwin.sh
+
+   preconfigure || fatal "preconfigure hook failed"
 
 #   trace configure \
    sh Configure -Duselargefiles \
@@ -200,11 +264,11 @@
                 -Uusethreads \
                 -Uuseithreads \
                 -Uusemultiplicity \
-                -Duseperlio \
                 -Uusesfio \
                 -Uuseshrplib \
-                -Dcppflags="$PERL_CPPFLAGS" \
-                -Dccflags="-g2 -fno-strict-aliasing" \
+                -Uinstallusrbinperl \
+                -A ccflags=" $PERL_CCFLAGS" \
+                -Dcc="$PERL_CC" \
                 -Doptimize="$PERL_OPTIMIZE" \
                 -Dldflags="$PERL_LDFLAGS" \
                 -Dlibs="$PERL_LIBS" \
@@ -215,7 +279,6 @@
                 -Uusevendorprefix \
                 -Dsitelib="$PERL_PREFIX/lib" \
                 -Dsitearch="$PERL_PREFIX/lib" \
-                -Usitelibexp \
                 -Uman1dir \
                 -Uman3dir \
                 -Usiteman1dir \
@@ -225,18 +288,32 @@
                 -Dcf_email="$EMAIL" \
                 -Dcf_by="$EMAIL" \
                 $PERL_CONFIGURE \
-                -dE || fatal "Configure failed"
+                -Duseperlio \
+                -dE || configure_failure
 
    sedreplace '
       s/-Wl,--no-gc-sections/-Wl,--gc-sections/g
       s/ *-fno-stack-protector */ /g
    ' config.sh
 
+   patchconfig || fatal "patchconfig hook failed"
+
    sh Configure -S || fatal "Configure -S failed"
 
    postconfigure || fatal "postconfigure hook failed"
 
-   touch staticstamp.configure
+   : > staticstamp.configure
+}
+
+write_shellscript() {
+   {
+      echo "#!/bin/sh"
+      echo "STATICPERL=\"$STATICPERL\""
+      echo "PERL_PREFIX=\"$PERL_PREFIX\""
+      echo "MAKE=\"$MAKE\""
+      cat
+   } >"$PERL_PREFIX/bin/$1"
+   chmod 755 "$PERL_PREFIX/bin/$1"
 }
 
 build() {
@@ -250,11 +327,23 @@
 
    rm -f "$PERL_PREFIX/staticstamp.install"
 
-   make || fatal "make: error while building perl"
+   "$MAKE" || fatal "make: error while building perl"
 
    postbuild || fatal "postbuild hook failed"
 }
 
+_postinstall() {
+   if ! [ -e "$PERL_PREFIX/staticstamp.postinstall" ]; then
+      NOCHECK_INSTALL=+
+      instcpan $STATICPERL_MODULES
+      [ $EXTRA_MODULES ] && instcpan $EXTRA_MODULES
+
+      postinstall || fatal "postinstall hook failed"
+
+      : > "$PERL_PREFIX/staticstamp.postinstall"
+   fi
+}
+
 install() {
    if ! [ -e "$PERL_PREFIX/staticstamp.install" ]; then
       build
@@ -267,36 +356,34 @@
       ln -sf "perl/bin/" "$STATICPERL/bin"
       ln -sf "perl/lib/" "$STATICPERL/lib"
 
+      mkdir "$STATICPERL/patched"
+
       ln -sf "$PERL_PREFIX" "$STATICPERL/perl" # might get overwritten
       rm -rf "$PERL_PREFIX"                    # by this rm -rf
 
-      make install || fatal "make install: error while installing"
+      "$MAKE" install || fatal "make install: error while installing"
 
       rcd "$PERL_PREFIX"
 
       # create a "make install" replacement for CPAN
-      cat >"$PERL_PREFIX"/bin/cpan-make-install <<EOF
-make || exit
-
-if find blib/arch/auto -type f | grep -q -v .exists; then
-   echo Probably an XS module, rebuilding perl
-   if make perl; then
-      mv perl "$PERL_PREFIX"/bin/perl
-      make -f Makefile.aperl map_clean
-   else
-      make -f Makefile.aperl map_clean
-      exit 1
-   fi
-fi
+      write_shellscript SP-make-install-make <<'EOF'
+#CAT make-install-make.sh
+EOF
 
-make install UNINST=1
+      # create a "patch modules" helper
+      write_shellscript SP-patch-postinstall <<'EOF'
+#CAT patch-postinstall.sh
 EOF
-      chmod 755 "$PERL_PREFIX"/bin/cpan-make-install
 
-      # trick CPAN into avoiding ~/.cpan completely
+      "$PERL_PREFIX/bin/SP-patch-postinstall"
+
+      # help to 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, which
+      # is strictly unnecssary as we have to patch CPAN anyway,
+      # so consider it "for good measure".
+      "$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>);
@@ -305,24 +392,38 @@
          CPAN::Shell->o (conf => q<prefs_dir>, "'"$STATICPERL"'/cpan/prefs");
          CPAN::Shell->o (conf => q<histfile> , "'"$STATICPERL"'/cpan/histfile");
          CPAN::Shell->o (conf => q<keep_source_where>, "'"$STATICPERL"'/cpan/sources");
-         CPAN::Shell->o (conf => q<make_install_make_command>, "'"$PERL_PREFIX"'/bin/cpan-make-install");
+         CPAN::Shell->o (conf => q<make_install_make_command>, "'"$PERL_PREFIX"'/bin/SP-make-install-make");
          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"
 
-      touch "$PERL_PREFIX/staticstamp.install"
+      : > "$PERL_PREFIX/staticstamp.install"
    fi
 
-   if ! [ -e "$PERL_PREFIX/staticstamp.postinstall" ]; then
-      NOCHECK_INSTALL=+
-      instcpan $STATICPERL_MODULES
-      [ $EXTRA_MODULES ] && instcpan $EXTRA_MODULES
+   _postinstall
+}
 
-      postinstall || fatal "postinstall hook failed"
+import() {
+   IMPORT="$1"
+
+   rcd "$STATICPERL"
 
-      touch "$PERL_PREFIX/staticstamp.postinstall"
+   if ! [ -e "$PERL_PREFIX/staticstamp.install" ]; then
+      verblock <<EOF
+import perl from $IMPORT to $STATICPERL
+EOF
+
+      rm -rf bin cpan lib patched perl src
+      mkdir -m 755 perl perl/bin
+      ln -s perl/bin/ bin
+      ln -s "$IMPORT" perl/bin/
+
+      : > "$PERL_PREFIX/staticstamp.install"
    fi
+
+   _postinstall
 }
 
 #############################################################################
@@ -336,11 +437,13 @@
 $@
 EOF
 
-   for mod in "$@"; do
-      "$PERL_PREFIX"/bin/perl -MCPAN -e 'notest install => "'"$mod"'"' \
-         || fatal "$mod: unable to install from CPAN"
-   done
-   rm -rf "$STATICPERL/build"
+   #"$PERL_PREFIX"/bin/perl -MCPAN::MyConfig -MCPAN -e 'notest install $_ for @ARGV' -- "$@" | tee "$STATICPERL/instcpan.log"
+   "$PERL_PREFIX"/bin/perl -MCPAN -e 'notest install $_ for @ARGV' -- "$@" | tee "$STATICPERL/instcpan.log"
+
+   if grep -q " -- NOT OK\$" "$STATICPERL/instcpan.log"; then
+      fatal "failure while installing modules from CPAN ($@)"
+   fi
+   rm -f "$STATICPERL/instcpan.log"
 }
 
 #############################################################################
@@ -359,12 +462,12 @@
       echo $mod
       (
          rcd $mod
-         make -f Makefile.aperl map_clean >/dev/null 2>&1
-         make distclean >/dev/null 2>&1
+         "$MAKE" -f Makefile.aperl map_clean >/dev/null 2>&1
+         "$MAKE" distclean >/dev/null 2>&1
          "$PERL_PREFIX"/bin/perl Makefile.PL || fatal "$mod: error running Makefile.PL"
-         make || fatal "$mod: error building module"
-         "$PERL_PREFIX"/bin/cpan-make-install || fatal "$mod: error installing module"
-         make distclean >/dev/null 2>&1
+         "$MAKE" || fatal "$mod: error building module"
+         "$PERL_PREFIX"/bin/SP-make-install-make install || fatal "$mod: error installing module"
+         "$MAKE" distclean >/dev/null 2>&1
          exit 0
       ) || exit $?
    done
@@ -375,17 +478,19 @@
 
 podusage() {
    echo
+
    if [ -e "$PERL_PREFIX/bin/perl" ]; then
       "$PERL_PREFIX/bin/perl" -MPod::Usage -e \
          'pod2usage -input => *STDIN, -output => *STDOUT, -verbose => '$1', -exitval => 0, -noperldoc => 1' <"$0" \
          2>/dev/null && exit
    fi
+
    # try whatever perl we can find
    perl -MPod::Usage -e \
       'pod2usage -input => *STDIN, -output => *STDOUT, -verbose => '$1', -exitval => 0, -noperldoc => 1' <"$0" \
       2>/dev/null && exit
 
-   fatal "displaying documentation requires a working perl - try '$0 install' first"
+   fatal "displaying documentation requires a working perl - try '$0 install' to build one in a safe location"
 }
 
 usage() {
@@ -403,6 +508,7 @@
 }
 
 bundle() {
+   MKBUNDLE="${MKBUNDLE:=$PERL_PREFIX/bin/SP-mkbundle}"
    catmkbundle >"$MKBUNDLE~" || fatal "$MKBUNDLE~: cannot create"
    chmod 755 "$MKBUNDLE~" && mv "$MKBUNDLE~" "$MKBUNDLE"
    CACHE="$STATICPERL/cache"
@@ -420,34 +526,45 @@
          version )
             echo "staticperl version $VERSION"
             ;;
-         fetch | configure | build | install | clean | distclean)
-            ( "$command" )
+         fetch | configure | build | install | clean | realclean | distclean )
+            ( "$command" ) || exit
+            ;;
+         import )
+            ( import "$1" ) || exit
+            shift
             ;;
          instsrc )
-            ( instsrc "$@" )
+            ( instsrc "$@" ) || exit
             exit
             ;;
          instcpan )
-            ( instcpan "$@" )
+            ( instcpan "$@" ) || exit
+            exit
+            ;;
+         perl )
+            ( install ) || exit
+            exec "$PERL_PREFIX/bin/perl" "$@"
             exit
             ;;
          cpan )
-            ( install )
-            "$PERL_PREFIX/bin/cpan" "$@"
+            ( install ) || exit
+            PERL="$PERL_PREFIX/bin/perl"
+            export PERL
+            exec "$PERL_PREFIX/bin/cpan" "$@"
             exit
             ;;
          mkbundle )
-            ( install )
+            ( install ) || exit
             bundle "$@"
             exit
             ;;
          mkperl )
-            ( install )
+            ( install ) || exit
             bundle --perl "$@"
             exit
             ;;
          mkapp )
-            ( install )
+            ( install ) || exit
             bundle --app "$@"
             exit
             ;;