Magellan Linux

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

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

revision 2743 by niro, Tue Aug 12 21:53:03 2014 UTC revision 2744 by niro, Wed Aug 13 07:06:44 2014 UTC
# Line 281  fi Line 281  fi
281  mqueryfeature "srcpkgtarball" || download_sources  mqueryfeature "srcpkgtarball" || download_sources
282    
283  # fixes some issues with these functions  # fixes some issues with these functions
284  export -f src_setup || die "src_setup export failed"  export -f pkg_setup || die "pkg_setup export failed"
285  export -f src_prepare || die "src_prepare export failed"  export -f src_prepare || die "src_prepare export failed"
286  export -f src_compile || die "src_compile export failed"  export -f src_compile || die "src_compile export failed"
287  export -f src_check || die "src_check export failed"  export -f src_check || die "src_check export failed"
# Line 367  then Line 367  then
367   # automatically set !pkgbuild here too   # automatically set !pkgbuild here too
368   msetfeature "!pkgbuild"   msetfeature "!pkgbuild"
369  else  else
370   ( run_resume src_setup || src_setup ) | ${SMAGE_LOG_CMD}   ( run_resume pkg_setup || pkg_setup ) | ${SMAGE_LOG_CMD}
371   die_pipestatus 0 "src_setup failed"   die_pipestatus 0 "pkg_setup failed"
372   resume_stamp src_setup   resume_stamp pkg_setup
373   step_by_step src_setup   step_by_step pkg_setup
374    
375   ( run_resume src_prepare || src_prepare ) | ${SMAGE_LOG_CMD}   ( run_resume src_prepare || src_prepare ) | ${SMAGE_LOG_CMD}
376   die_pipestatus 0 "src_prepare failed"   die_pipestatus 0 "src_prepare failed"

Legend:
Removed from v.2743  
changed lines
  Added in v.2744