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

Comparing App-Staticperl/staticperl.sh (file contents):
Revision 1.64 by root, Mon Jun 26 20:33:30 2017 UTC vs.
Revision 1.75 by root, Tue Aug 1 03:48:59 2023 UTC

 # which extra modules you might want to install
 EXTRA_MODULES=""
 # overridable functions
-preconfigure()  { : ; }
+preconfigure()   { : ; }
-patchconfig()   { : ; }
+patchconfig()    { : ; }
-postconfigure() { : ; }
+postconfigure()  { : ; }
-postbuild()     { : ; }
+postbuild()      { : ; }
+postcpanconfig() { : ; }
-postinstall()   { : ; }
+postinstall()    { : ; }
 # now source user config, if any
 if [ "$STATICPERLRC" ]; then
    . "$STATICPERLRC"
 else
 #############################################################################
 # support
 # work around ExtUtils::CBuilder and others
 export CC="$PERL_CC"
-export CFLAGS="$PERL_CFLASGS"
+export CFLAGS="$PERL_CFLAGS"
 export LD="$PERL_CC"
 export LDFLAGS="$PERL_LDFLAGS"
 unset LIBS
 PERL_PREFIX="${PERL_PREFIX:=$STATICPERL/perl}" # where the perl gets installed
 # 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="1.44"
+$VERSION="1.46"
 fatal() {
    printf -- "\nFATAL: %s\n\n" "$*" >&2
    exit 1
 }
    rm -f "$PERL_PREFIX/staticstamp.install"
    rm -f "$STATICPERL/src/perl/staticstamp.configure"
 }
 fetch() {
+(
    rcd "$STATICPERL"
    mkdir -p src
    rcd src
          *.lzma ) UNCOMPRESS="lzma -d"  ;;
          *.bz2  ) UNCOMPRESS="bzip2 -d" ;;
          *.gz   ) UNCOMPRESS="gzip -d"  ;;
          *.tar  ) UNCOMPRESS="cat"      ;;
          * )
-            fatal "don't know hot to uncompress $PERL_TAR,\nonly tar, tar.gz, tar.bz2, tar.lzma and tar.xz are supported."
+            fatal "don't know hot to uncompress $PERLTAR,\nonly tar, tar.gz, tar.bz2, tar.lzma and tar.xz are supported."
             exit 1
             ;;
       esac
       <"$PERLTAR" $UNCOMPRESS -d | ( cd unpack && tar xf - ) \
          fatal "unpacking $PERLTAR did not result in a single directory, don't know how to handle this"
       fi
       rm "$PERLTAR"
    fi
+) || exit
 }
 # similar to GNU-sed -i or perl -pi
 sedreplace() {
    sed -e "$1" <"$2" > "$2~" || fatal "error while running sed"
 EOF
    exit 1
 }
 configure() {
+(
    fetch
    rcd "$STATICPERL/src/perl"
    [ -e staticstamp.configure ] && return
    sh Configure -S || fatal "Configure -S failed"
    postconfigure || fatal "postconfigure hook failed"
    : > staticstamp.configure
+) || exit
 }
 write_shellscript() {
    {
       echo "#!/bin/sh"
    } >"$PERL_PREFIX/bin/$1"
    chmod 755 "$PERL_PREFIX/bin/$1"
 }
 build() {
+(
    configure
    rcd "$STATICPERL/src/perl"
    verblock <<EOF
    rm -f "$PERL_PREFIX/staticstamp.install"
    "$MAKE" || fatal "make: error while building perl"
    postbuild || fatal "postbuild hook failed"
+) || exit
 }
 _postinstall() {
    if ! [ -e "$PERL_PREFIX/staticstamp.postinstall" ]; then
       NOCHECK_INSTALL=+
       : > "$PERL_PREFIX/staticstamp.postinstall"
    fi
 }
 install() {
+(
    if ! [ -e "$PERL_PREFIX/staticstamp.install" ]; then
       build
       verblock <<EOF
 installing $STATICPERL/src/perl
       mkdir "$STATICPERL/patched"
       ln -sf "$PERL_PREFIX" "$STATICPERL/perl" # might get overwritten
       rm -rf "$PERL_PREFIX"                    # by this rm -rf
+      rcd "$STATICPERL/src/perl"
       "$MAKE" install || fatal "make install: error while installing"
       rcd "$PERL_PREFIX"
       # create a "make install" replacement for CPAN
-      write_shellscript SP-make-install-make <<'EOF'
+      write_shellscript SP-make-make <<'end_of_make'
+#CAT make-make.sh
+end_of_make
+      # create a "make install" replacement for CPAN
+      write_shellscript SP-make-install-make <<'end_of_make_install_make'
 #CAT make-install-make.sh
-EOF
+end_of_make_install_make
       # create a "patch modules" helper
-      write_shellscript SP-patch-postinstall <<'EOF'
+      write_shellscript SP-patch-postinstall <<'end_of_patch_postinstall'
 #CAT patch-postinstall.sh
-EOF
+end_of_patch_postinstall
       # immediately use it
       "$PERL_PREFIX/bin/SP-patch-postinstall"
       # help to trick CPAN into avoiding ~/.cpan completely
       echo 1 >"$PERL_PREFIX/lib/CPAN/MyConfig.pm"
       # we call cpan with -MCPAN::MyConfig in this script, which
-      # is strictly unnecssary as we have to patch CPAN anyway,
+      # is strictly unnecessary 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 => pushy_https => "0");
          CPAN::Shell->o (conf => q<cpan_home>, "'"$STATICPERL"'/cpan");
          CPAN::Shell->o (conf => q<init>);
          CPAN::Shell->o (conf => q<cpan_home>, "'"$STATICPERL"'/cpan");
          CPAN::Shell->o (conf => q<build_dir>, "'"$STATICPERL"'/cpan/build");
          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<makepl_arg>, "MAP_TARGET=perl");
+         CPAN::Shell->o (conf => q<make>, "'"$PERL_PREFIX"'/bin/SP-make-make");
          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<yes>);
+         CPAN::Shell->o (conf => q<recommends_policy>, q<0>);
+         CPAN::Shell->o (conf => q<suggests_policy>, q<0>);
-         CPAN::Shell->o (conf => q<prefer_installer>, "EUMM");
+         CPAN::Shell->o (conf => q<prefer_installer>, q<EUMM>);
          CPAN::Shell->o (conf => q<commit>);
       ' || fatal "error while initialising CPAN"
+      postcpanconfig
       : > "$PERL_PREFIX/staticstamp.install"
    fi
    _postinstall
+) || exit
 }
 import() {
+(
    IMPORT="$1"
    rcd "$STATICPERL"
    if ! [ -e "$PERL_PREFIX/staticstamp.install" ]; then
       : > "$PERL_PREFIX/staticstamp.install"
    fi
    _postinstall
+) || exit
 }
 #############################################################################
 # install a module from CPAN
 instcpan() {
    [ $NOCHECK_INSTALL ] || install
    verblock <<EOF
 installing modules from CPAN
-$@
+$*
 EOF
    MYCONFIG=
    [ -e "$PERL_PREFIX/.import" ] || MYCONFIG=-MCPAN::MyConfig
    "$PERL_PREFIX"/bin/perl $MYCONFIG -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 ($@)"
+      fatal "failure while installing modules from CPAN ($*)"
    fi
    rm -f "$STATICPERL/instcpan.log"
 }
 #############################################################################
 instsrc() {
    [ $NOCHECK_INSTALL ] || install
    verblock <<EOF
 installing modules from source
-$@
+$*
 EOF
    for mod in "$@"; do
       echo
       echo $mod
 catmkbundle() {
    {
       read dummy
       echo "#!$PERL_PREFIX/bin/perl"
       cat
-   } <<'MKBUNDLE'
+   } <<'end_of_mkbundle'
 #CAT mkbundle
-MKBUNDLE
+end_of_mkbundle
 }
 bundle() {
    MKBUNDLE="${MKBUNDLE:=$PERL_PREFIX/bin/SP-mkbundle}"
    catmkbundle >"$MKBUNDLE~" || fatal "$MKBUNDLE~: cannot create"

Diff Legend

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

Comparing App-Staticperl/staticperl.sh (file contents): Revision 1.64 by root, Mon Jun 26 20:33:30 2017 UTC vs. Revision 1.75 by root, Tue Aug 1 03:48:59 2023 UTC

Diff Legend

Comparing App-Staticperl/staticperl.sh (file contents):
Revision 1.64 by root, Mon Jun 26 20:33:30 2017 UTC vs.
Revision 1.75 by root, Tue Aug 1 03:48:59 2023 UTC