--- App-Staticperl/staticperl.sh 2010/12/10 20:29:17 1.14 +++ App-Staticperl/staticperl.sh 2010/12/12 00:38:36 1.17 @@ -7,7 +7,6 @@ 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 PERL_CONFIGURE="" # additional Configure arguments @@ -29,8 +28,8 @@ # -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_LIBS="-lm -lcrypt" # perl loves to add lotsa crap itself # some configuration options for modules @@ -71,7 +70,7 @@ # set version in a way that Makefile.PL can extract VERSION=VERSION; eval \ -$VERSION=0.9 +$VERSION=0.911 BZ2=bz2 BZIP2=bzip2 @@ -375,17 +374,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() {