--- App-Staticperl/staticperl.sh 2010/12/10 20:29:17 1.14 +++ App-Staticperl/staticperl.sh 2011/05/01 07:56:26 1.40 @@ -7,11 +7,12 @@ CPAN=http://mirror.netcologne.de/cpan # which mirror to use EMAIL="read the documentation " - # 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 +30,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 CORO_INTERFACE EV_EXTRA_DEFS # which extra modules to install by default from CPAN that are # required by mkbundle @@ -47,6 +51,7 @@ # overridable functions preconfigure() { : ; } +patchconfig() { : ; } postconfigure() { : ; } postbuild() { : ; } postinstall() { : ; } @@ -63,15 +68,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.21" BZ2=bz2 BZIP2=bzip2 @@ -127,6 +136,12 @@ rm -rf "$STATICPERL/src/perl-$PERL_VERSION" } +realclean() { + rm -f "$PERL_PREFIX/staticstamp.postinstall" + rm -f "$PERL_PREFIX/staticstamp.install" + rm -f "$STATICPERL/src/perl-"*"/staticstamp.configure" +} + fetch() { rcd "$STATICPERL" @@ -146,9 +161,10 @@ 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" \ + curl -f >perl-$PERL_VERSION.tar.$BZ2~ "$URL" \ + || wget -O perl-$PERL_VERSION.tar.$BZ2~ "$URL" \ || fatal "$URL: unable to download" + rm -f perl-$PERL_VERSION.tar.$BZ2 mv perl-$PERL_VERSION.tar.$BZ2~ perl-$PERL_VERSION.tar.$BZ2 fi @@ -157,8 +173,9 @@ EOF mkdir -p unpack - $BZIP2 -d "$2~" || fatal "error while running sed" + rm -f "$2" mv "$2~" "$2" } +configure_failure() { + cat </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 +250,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 +265,6 @@ -Uusevendorprefix \ -Dsitelib="$PERL_PREFIX/lib" \ -Dsitearch="$PERL_PREFIX/lib" \ - -Usitelibexp \ -Uman1dir \ -Uman3dir \ -Usiteman1dir \ @@ -225,13 +274,16 @@ -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" @@ -239,6 +291,17 @@ touch 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() { configure @@ -250,7 +313,7 @@ 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" } @@ -267,36 +330,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 <"$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, "'"$STATICPERL"'/cpan"); CPAN::Shell->o (conf => q); @@ -305,9 +366,10 @@ CPAN::Shell->o (conf => q, "'"$STATICPERL"'/cpan/prefs"); CPAN::Shell->o (conf => q , "'"$STATICPERL"'/cpan/histfile"); CPAN::Shell->o (conf => q, "'"$STATICPERL"'/cpan/sources"); - CPAN::Shell->o (conf => q, "'"$PERL_PREFIX"'/bin/cpan-make-install"); + CPAN::Shell->o (conf => q, "'"$PERL_PREFIX"'/bin/SP-make-install-make"); CPAN::Shell->o (conf => q, q); CPAN::Shell->o (conf => q, q); + CPAN::Shell->o (conf => q, "EUMM"); CPAN::Shell->o (conf => q); ' || fatal "error while initialising CPAN" @@ -337,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" @@ -359,12 +421,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 +437,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 +467,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 +485,39 @@ version ) echo "staticperl version $VERSION" ;; - fetch | configure | build | install | clean | distclean) - ( "$command" ) + fetch | configure | build | install | clean | realclean | distclean) + ( "$command" ) || exit ;; 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 + 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 ;;