[ViewVC] Diff of: cvs/App-Staticperl/staticperl.sh

Comparing App-Staticperl/staticperl.sh (file contents):
Revision 1.21 by root, Mon Dec 13 18:08:01 2010 UTC vs.
Revision 1.23 by root, Sat Dec 18 13:58:12 2010 UTC

 # perl build variables
 MAKE=make
 PERL_VERSION=5.12.2 # 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="-DPERL_DISABLE_PMC -DPERL_ARENA_SIZE=65536 -D_GNU_SOURCE -DNDEBUG"
 PERL_OPTIMIZE="-Os -ffunction-sections -fdata-sections -finline-limit=8 -ffast-math"
 ARCH="$(uname -m)"
 case "$ARCH" in
    i*86 | x86_64 | amd64 )
-      #PERL_OPTIMIZE="$PERL_OPTIMIZE -mpush-args -mno-inline-stringops-dynamically -mno-align-stringops -mno-ieee-fp" # x86/amd64
+      PERL_OPTIMIZE="$PERL_OPTIMIZE -mpush-args -mno-inline-stringops-dynamically -mno-align-stringops -mno-ieee-fp" # x86/amd64
-      PERL_OPTIMIZE="$PERL_OPTIMIZE" # x86/amd64
       case "$ARCH" in
          i*86 )
             PERL_OPTIMIZE="$PERL_OPTIMIZE -fomit-frame-pointer -march=pentium3 -mtune=i386" # x86 only
             ;;
       esac
 unset PERL5OPT PERL5LIB PERLLIB PERL_UNICODE PERLIO_DEBUG
 export LC_ALL=C # just to be on the safe side
 # set version in a way that Makefile.PL can extract
 VERSION=VERSION; eval \
-$VERSION=0.911
+$VERSION=0.912
 BZ2=bz2
 BZIP2=bzip2
 fatal() {
 clean() {
    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"
    mkdir -p src
    rcd src
    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
    rcd "$STATICPERL/src/perl-$PERL_VERSION"
    rm -f "$PERL_PREFIX/staticstamp.install"
    "$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
                 -Uusethreads \
                 -Uuseithreads \
                 -Uusemultiplicity \
                 -Uusesfio \
                 -Uuseshrplib \
+                -A ccflags=" $PERL_CCFLAGS" \
                 -Dcc="$PERL_CC" \
-                -Dcppflags="$PERL_CPPFLAGS" \
-                -Dccflags="-g2 -fno-strict-aliasing" \
                 -Doptimize="$PERL_OPTIMIZE" \
                 -Dldflags="$PERL_LDFLAGS" \
                 -Dlibs="$PERL_LIBS" \
                 -Dprefix="$PERL_PREFIX" \
                 -Dbin="$PERL_PREFIX/bin" \
                 -Dprivlib="$PERL_PREFIX/lib" \
                 -Darchlib="$PERL_PREFIX/lib" \
                 -Uusevendorprefix \
                 -Dsitelib="$PERL_PREFIX/lib" \
                 -Dsitearch="$PERL_PREFIX/lib" \
-                -Usitelibexp \
                 -Uman1dir \
                 -Uman3dir \
                 -Usiteman1dir \
                 -Usiteman3dir \
                 -Dpager=/usr/bin/less \
                 -Demail="$EMAIL" \
                 -Dcf_email="$EMAIL" \
                 -Dcf_by="$EMAIL" \
                 $PERL_CONFIGURE \
                 -Duseperlio \
-                -dE || fatal "Configure failed"
+                -dE || configure_failure
    sedreplace '
       s/-Wl,--no-gc-sections/-Wl,--gc-sections/g
       s/ *-fno-stack-protector */ /g
    ' config.sh
       command="${1#--}"; shift
       case "$command" in
          version )
             echo "staticperl version $VERSION"
             ;;
-         fetch | configure | build | install | clean | distclean)
+         fetch | configure | build | install | clean | realclean | distclean)
-            ( "$command" )
+            ( "$command" ) || exit
             ;;
          instsrc )
-            ( instsrc "$@" )
+            ( instsrc "$@" ) || exit
             exit
             ;;
          instcpan )
-            ( instcpan "$@" )
+            ( instcpan "$@" ) || exit
             exit
             ;;
          cpan )
-            ( install )
+            ( install ) || exit
             "$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
             ;;
          help )
             podusage 2

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing App-Staticperl/staticperl.sh (file contents): Revision 1.21 by root, Mon Dec 13 18:08:01 2010 UTC vs. Revision 1.23 by root, Sat Dec 18 13:58:12 2010 UTC

Diff Legend

Comparing App-Staticperl/staticperl.sh (file contents):
Revision 1.21 by root, Mon Dec 13 18:08:01 2010 UTC vs.
Revision 1.23 by root, Sat Dec 18 13:58:12 2010 UTC