Magellan Linux

  • Back to homepage
    • /[magellan-source]/trunk/mage/usr/lib/mage/smage2.sh

    Diff of /trunk/mage/usr/lib/mage/smage2.sh

    Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

    revision 2805 by niro, Tue Sep 2 13:53:08 2014 UTC revision 3034 by niro, Fri Jun 30 12:09:53 2017 UTC
    # Line 289  export -f src_install || die "src_instal Line 289  export -f src_install || die "src_instal
    289    
    290  # fixes some compile issues  # fixes some compile issues
    291  export CHOST="${CHOST}" || die "CHOST export failed"  export CHOST="${CHOST}" || die "CHOST export failed"
    292    export CPPFLAGS="${CPPFLAGS}" || die "CPPFLAGS export failed"
    293  export CFLAGS="${CFLAGS}" || die "CFLAGS export failed"  export CFLAGS="${CFLAGS}" || die "CFLAGS export failed"
    294  if [[ -z ${CXXFLAGS} ]]  if [[ -z ${CXXFLAGS} ]]
    295  then  then
    # Line 367  then Line 368  then
    368   # automatically set !pkgbuild here too   # automatically set !pkgbuild here too
    369   msetfeature "!pkgbuild"   msetfeature "!pkgbuild"
    370  else  else
    371   ( run_resume pkg_setup || pkg_setup ) | ${SMAGE_LOG_CMD}   ( run_resume pkg_setup || pkg_setup ) |& ${SMAGE_LOG_CMD}
    372   die_pipestatus 0 "pkg_setup failed"   die_pipestatus 0 "pkg_setup failed"
    373   resume_stamp pkg_setup   resume_stamp pkg_setup
    374   step_by_step pkg_setup   step_by_step pkg_setup
    375    
    376   ( run_resume src_prepare || src_prepare ) | ${SMAGE_LOG_CMD}   ( run_resume src_prepare || src_prepare ) |& ${SMAGE_LOG_CMD}
    377   die_pipestatus 0 "src_prepare failed"   die_pipestatus 0 "src_prepare failed"
    378   resume_stamp src_prepare   resume_stamp src_prepare
    379   step_by_step src_prepare   step_by_step src_prepare
    380    
    381   ( run_resume src_compile || src_compile ) | ${SMAGE_LOG_CMD}   ( run_resume src_compile || src_compile ) |& ${SMAGE_LOG_CMD}
    382   die_pipestatus 0 "src_compile failed"   die_pipestatus 0 "src_compile failed"
    383   resume_stamp src_compile   resume_stamp src_compile
    384   step_by_step src_compile   step_by_step src_compile
    # Line 385  else Line 386  else
    386   # only run checks if requested   # only run checks if requested
    387   if mqueryfeature "!check"   if mqueryfeature "!check"
    388   then   then
    389   echo "!check detected; src_check() will not be run!" | ${SMAGE_LOG_CMD}   echo "!check detected; src_check() will not be run!" |& ${SMAGE_LOG_CMD}
    390   else   else
    391   ( run_resume src_check || src_check ) | ${SMAGE_LOG_CMD}   ( run_resume src_check || src_check ) |& ${SMAGE_LOG_CMD}
    392   die_pipestatus 0 "src_check failed"   die_pipestatus 0 "src_check failed"
    393   resume_stamp src_check   resume_stamp src_check
    394   fi   fi
    # Line 428  else Line 429  else
    429   echo -en " for subpkg: ${COLBLUE}${PNAME}${COLDEFAULT}"   echo -en " for subpkg: ${COLBLUE}${PNAME}${COLDEFAULT}"
    430   echo -e " - basepkg: ${COLBLUE}${SPLIT_PACKAGE_BASE}${COLDEFAULT} ..."   echo -e " - basepkg: ${COLBLUE}${SPLIT_PACKAGE_BASE}${COLDEFAULT} ..."
    431    
    432   ( run_resume src_install_${subpackage} || src_install_${subpackage} ) | ${SMAGE_LOG_CMD}   ( run_resume src_install_${subpackage} || src_install_${subpackage} ) |& ${SMAGE_LOG_CMD}
    433   die_pipestatus 0 "src_install_${subpackage} failed"   die_pipestatus 0 "src_install_${subpackage} failed"
    434   resume_stamp src_install_${subpackage}   resume_stamp src_install_${subpackage}
    435   step_by_step src_install_${subpackage}   step_by_step src_install_${subpackage}
    # Line 440  else Line 441  else
    441   # unset all saved smage variables   # unset all saved smage variables
    442   split_unset_variables   split_unset_variables
    443   else   else
    444   ( run_resume src_install || src_install ) | ${SMAGE_LOG_CMD}   ( run_resume src_install || src_install ) |& ${SMAGE_LOG_CMD}
    445   die_pipestatus 0 "src_install failed"   die_pipestatus 0 "src_install failed"
    446   resume_stamp src_install   resume_stamp src_install
    447   step_by_step src_install   step_by_step src_install
    Legend:
    Removed from v.2805  
    changed lines
      Added in v.3034