Magellan Linux

  • Back to homepage
    • /[magellan-source]/branches/mage-next/src/smage2.in

    Diff of /branches/mage-next/src/smage2.in

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

    revision 1616 by niro, Mon Jan 9 20:11:08 2012 UTC revision 1639 by niro, Fri Jan 13 18:27:28 2012 UTC
    # Line 21  source ${MLIBDIR}/mage4.functions.sh Line 21  source ${MLIBDIR}/mage4.functions.sh
    21  SMAGENAME="$1"  SMAGENAME="$1"
    22  SMAGEVERSION="$(< ${MLIBDIR}/version)"  SMAGEVERSION="$(< ${MLIBDIR}/version)"
    23    
    24  # set PKGDIR and BUILDDIR and BINDIR to MROOT  # expand PKGDIR, BUILDDIR and BINDIR with MROOT
    25  if [[ -n ${MROOT} ]]  if [[ -n ${MROOT} ]]
    26  then  then
    27   export PKGDIR=${MROOT}/${PKGDIR}   export PKGDIR=${MROOT}/${PKGDIR}
    # Line 177  download_sources() Line 177  download_sources()
    177   fi   fi
    178    
    179   echo -e "${COLBLUE}==>${COLGREEN} fetching ${uri}${COLDEFAULT}"   echo -e "${COLBLUE}==>${COLGREEN} fetching ${uri}${COLDEFAULT}"
    180     # always use verbose mode for source downloads
    181     FVERBOSE=off msetfeature "verbose"
    182   # do not die here, mchecksum catches download errors   # do not die here, mchecksum catches download errors
    183   mdownload --uri "${uri}" --dir "${outputdir}"   mdownload --uri "${uri}" --dir "${outputdir}"
    184    
    # Line 240  mconfigure() Line 242  mconfigure()
    242   local myopts   local myopts
    243   if [[ ! -z ${CTARGET} ]]   if [[ ! -z ${CTARGET} ]]
    244   then   then
    245   myopts="--target=${CTARGET}"   myopts+=" --target=${CTARGET}"
    246   fi   fi
    247    
    248   if [ -x ./configure ]   if [ -x ./configure ]
    249   then   then
    250     # if requested disable-static
    251     if [[ ! -z $(./configure --help | grep -- '--.*able-static') ]]
    252     then
    253     if mqueryfeature '!static'
    254     then
    255     myopts+=" --disable-static"
    256     else
    257     myopts+=" --enable-static"
    258     fi
    259     fi
    260    
    261     # always enable shared by default
    262     if [[ ! -z $(./configure --help | grep -- '--.*able-shared') ]]
    263     then
    264     myopts+=" --enable-shared"
    265     fi
    266    
    267   ./configure \   ./configure \
    268   --prefix=/usr \   --prefix=/usr \
    269   --host=${CHOST} \   --host=${CHOST} \
    # Line 434  minstalldocs() Line 453  minstalldocs()
    453   cat ${doc} | gzip -9c > ${BINDIR}/usr/share/doc/${PNAME}-${PVER}/$(basename ${doc}).gz || die "gzipping +installing ${doc}."   cat ${doc} | gzip -9c > ${BINDIR}/usr/share/doc/${PNAME}-${PVER}/$(basename ${doc}).gz || die "gzipping +installing ${doc}."
    454   chmod 0644 ${BINDIR}/usr/share/doc/${PNAME}-${PVER}/$(basename ${doc}).gz || die "fixing permissions of ${doc}."   chmod 0644 ${BINDIR}/usr/share/doc/${PNAME}-${PVER}/$(basename ${doc}).gz || die "fixing permissions of ${doc}."
    455   else   else
    456   install -m 0644 ${SRCDIR}/${i} ${BINDIR}/usr/share/doc/${PNAME}-${PVER} || die "installing ${doc}."   install -m 0644 ${doc} ${BINDIR}/usr/share/doc/${PNAME}-${PVER} || die "installing ${doc}."
    457   fi   fi
    458   fi   fi
    459   done   done
    # Line 446  mstriplibs() Line 465  mstriplibs()
    465    
    466   [[ -z ${stripdir} ]] && stripdir="${BINDIR}"   [[ -z ${stripdir} ]] && stripdir="${BINDIR}"
    467   [[ -z ${STRIP_DYN_LIB} ]] && STRIP_DYN_LIB="--strip-debug"   [[ -z ${STRIP_DYN_LIB} ]] && STRIP_DYN_LIB="--strip-debug"
    468   find ${stripdir} ! -type d | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs --no-run-if-empty strip ${STRIP_DYN_LIB} 2> /dev/null   find ${stripdir} ! -type d | xargs --no-run-if-empty file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs --no-run-if-empty strip ${STRIP_DYN_LIB} 2> /dev/null
    469  }  }
    470    
    471  mstripbins()  mstripbins()
    # Line 455  mstripbins() Line 474  mstripbins()
    474    
    475   [[ -z ${stripdir} ]] && stripdir="${BINDIR}"   [[ -z ${stripdir} ]] && stripdir="${BINDIR}"
    476   [[ -z ${STRIP_DYN_BIN} ]] && STRIP_DYN_BIN="--strip-debug"   [[ -z ${STRIP_DYN_BIN} ]] && STRIP_DYN_BIN="--strip-debug"
    477   find ${stripdir} ! -type d | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs --no-run-if-empty strip ${STRIP_DYN_BIN} 2> /dev/null   find ${stripdir} ! -type d | xargs --no-run-if-empty file | grep "executable" | grep ELF | cut -f 1 -d : | xargs --no-run-if-empty strip ${STRIP_DYN_BIN} 2> /dev/null
    478  }  }
    479    
    480  mstripstatic()  mstripstatic()
    # Line 464  mstripstatic() Line 483  mstripstatic()
    483    
    484   [[ -z ${stripdir} ]] && stripdir="${BINDIR}"   [[ -z ${stripdir} ]] && stripdir="${BINDIR}"
    485   [[ -z ${STRIP_STATIC_LIB} ]] && STRIP_STATIC_LIB="--strip-debug"   [[ -z ${STRIP_STATIC_LIB} ]] && STRIP_STATIC_LIB="--strip-debug"
    486   find ${stripdir} ! -type d | xargs file | grep "ar archive" | cut -f 1 -d : | xargs --no-run-if-empty strip ${STRIP_STATIC_LIB} 2> /dev/null   find ${stripdir} ! -type d | xargs --no-run-if-empty file | grep "ar archive" | cut -f 1 -d : | xargs --no-run-if-empty strip ${STRIP_STATIC_LIB} 2> /dev/null
    487  }  }
    488    
    489  mstriplibtoolarchive()  mstriplibtoolarchive()
    # Line 472  mstriplibtoolarchive() Line 491  mstriplibtoolarchive()
    491   local stripdir="$@"   local stripdir="$@"
    492    
    493   [[ -z ${stripdir} ]] && stripdir="${BINDIR}"   [[ -z ${stripdir} ]] && stripdir="${BINDIR}"
    494   find ${stripdir} ! -type d -name \*.la | xargs | grep "libtool library" | cut -f 1 -d : | xargs --no-run-if-empty rm -f -- 2> /dev/null   find ${stripdir} ! -type d -name \*.la | xargs --no-run-if-empty file | grep "libtool library" | cut -f 1 -d : | xargs --no-run-if-empty rm -f -- 2> /dev/null
    495  }  }
    496    
    497  mpurgetargets()  mpurgetargets()
    # Line 1143  step_by_step() Line 1162  step_by_step()
    1162   fi   fi
    1163  }  }
    1164    
    1165    resume_stamp()
    1166    {
    1167     local step="$1"
    1168     [[ ! -d ${BUILDDIR}/.stamps ]] && install -d ${BUILDDIR}/.stamps
    1169     touch ${BUILDDIR}/.stamps/smage-${PKGNAME}-${step}
    1170    }
    1171    
    1172    run_resume()
    1173    {
    1174     local step="$1"
    1175    
    1176     if mqueryfeature "resume" && [[ -f ${BUILDDIR}/.stamps/smage-${PKGNAME}-${step} ]]
    1177     then
    1178     echo -e "${COLMAGENTA}${step} already processed; doing nothing${COLDEFAULT}"
    1179     return 0
    1180     else
    1181     return 1
    1182     fi
    1183    }
    1184    
    1185  # print out our version  # print out our version
    1186  showversion  showversion
    # Line 1363  then Line 1401  then
    1401   [[ ! -f ${SMAGENAME} ]] && die "Included smage2 file in src-tarball not found: ${SMAGENAME}"   [[ ! -f ${SMAGENAME} ]] && die "Included smage2 file in src-tarball not found: ${SMAGENAME}"
    1402  fi  fi
    1403    
    1404    if [ "$1" == "--resume" -a -n "$2" ]
    1405    then
    1406     msetfeature "resume"
    1407     SMAGENAME="$2"
    1408    fi
    1409    
    1410  [ ! -e ${MLIBDIR}/pkgbuild_dir.sh ] && die "Error: ${MLIBDIR}/pkgbuild_dir.sh not found. Aborting."  [ ! -e ${MLIBDIR}/pkgbuild_dir.sh ] && die "Error: ${MLIBDIR}/pkgbuild_dir.sh not found. Aborting."
    1411  [ -z "$(basename ${SMAGENAME} | grep .${SMAGESUFFIX})" ] &&  [ -z "$(basename ${SMAGENAME} | grep .${SMAGESUFFIX})" ] &&
    # Line 1386  echo -e "${COLGREEN}Compiling ${PKGNAME} Line 1429  echo -e "${COLGREEN}Compiling ${PKGNAME}
    1429  # auto regen mage tree if requested  # auto regen mage tree if requested
    1430  regen_mage_tree  regen_mage_tree
    1431    
    1432  if mqueryfeature "srcpkg"  if mqueryfeature "srcpkgbuild"
    1433  then  then
    1434   if [[ -d ${SOURCEDIR}/${PNAME} ]]   if [[ -d ${SOURCEDIR}/${PNAME} ]]
    1435   then   then
    # Line 1424  mqueryfeature "distcc" && setup_distcc_e Line 1467  mqueryfeature "distcc" && setup_distcc_e
    1467  # setup ccache  # setup ccache
    1468  mqueryfeature "ccache" && setup_ccache_environment  mqueryfeature "ccache" && setup_ccache_environment
    1469    
    1470  # clean up builddir if a previously one exist  if mqueryfeature "resume"
     if [ -d ${BUILDDIR} ]  
    1471  then  then
    1472   rm -rf ${BUILDDIR}/* || die "couldn't cleanup \$BUILDDIR."   echo -e "${COLMAGENTA}Resume requested; continuing previous build${COLDEFAULT}"
     fi  
     install -d ${BUILDDIR} || die "couldn't create \$BUILDDIR."  
    1473    
    1474  # clean up srcdir if a previously unpacked one exist   # setup build logging
    1475  if [ -d ${SRCDIR} ]   [[ ! -d /var/log/smage ]] && install -d /var/log/smage
    1476  then   if [[ -f /var/log/smage/${PKGNAME}.log.bz2 ]]
    1477   rm -rf ${SRCDIR}   then
    1478  fi   bunzip2 -f /var/log/smage/${PKGNAME}.log.bz2
    1479     fi
    1480     echo -e "### Resume started on $(date) ###\n" >> /var/log/smage/${PKGNAME}.log
    1481    
    1482  # clean up bindir if a previous build exist or create a new one  else
    1483  if [ -d ${BINDIR} ]   # clean up builddir if a previously one exist
    1484  then   if [ -d ${BUILDDIR} ]
    1485   rm -rf ${BINDIR}   then
    1486  fi   rm -rf ${BUILDDIR}/* || die "couldn't cleanup \$BUILDDIR."
    1487  install -d ${BINDIR} || die "couldn't create \$BINDIR."   fi
    1488     install -d ${BUILDDIR} || die "couldn't create \$BUILDDIR."
    1489    
    1490  # clean up package temp dir if a previous build exist   # clean up srcdir if a previously unpacked one exist
    1491  if [ -d ${BUILDDIR}/${PKGNAME} ]   if [ -d ${SRCDIR} ]
    1492  then   then
    1493   rm -rf ${BUILDDIR}/${PKGNAME}   rm -rf ${SRCDIR}
    1494  fi   fi
    1495    
    1496     # clean up bindir if a previous build exist or create a new one
    1497     if [ -d ${BINDIR} ]
    1498     then
    1499     rm -rf ${BINDIR}
    1500     fi
    1501     install -d ${BINDIR} || die "couldn't create \$BINDIR."
    1502    
    1503     # clean up package temp dir if a previous build exist
    1504     if [ -d ${BUILDDIR}/${PKGNAME} ]
    1505     then
    1506     rm -rf ${BUILDDIR}/${PKGNAME}
    1507     fi
    1508    
    1509     # clean up stamps dir
    1510     if [ -d ${BUILDDIR}/.stamps ]
    1511     then
    1512     rm -rf ${BUILDDIR}/.stamps
    1513     fi
    1514    
    1515  # setup build logging   # setup build logging
    1516  [[ ! -d /var/log/smage ]] && install -d /var/log/smage   [[ ! -d /var/log/smage ]] && install -d /var/log/smage
    1517  echo -e "### Build started on $(date) ###\n" > /var/log/smage/${PKGNAME}.log   echo -e "### Build started on $(date) ###\n" > /var/log/smage/${PKGNAME}.log
    1518    fi
    1519    
    1520  if [[ ${PKGTYPE} = virtual ]]  if [[ ${PKGTYPE} = virtual ]]
    1521  then  then
    # Line 1460  then Line 1523  then
    1523   # automatically set !pkgbuild here too   # automatically set !pkgbuild here too
    1524   msetfeature "!pkgbuild"   msetfeature "!pkgbuild"
    1525  else  else
    1526   src_prepare | ${SMAGE_LOG_CMD}   ( run_resume src_prepare || src_prepare ) | ${SMAGE_LOG_CMD}
    1527   die_pipestatus 0 "src_prepare failed"   die_pipestatus 0 "src_prepare failed"
    1528   step_by_step $_   resume_stamp src_prepare
    1529     step_by_step src_prepare
    1530    
    1531   src_compile | ${SMAGE_LOG_CMD}   ( run_resume src_compile || src_compile ) | ${SMAGE_LOG_CMD}
    1532   die_pipestatus 0 "src_compile failed"   die_pipestatus 0 "src_compile failed"
    1533   step_by_step $_   resume_stamp src_compile
    1534     step_by_step src_compile
    1535    
    1536   # only run checks if requested   # only run checks if requested
    1537   if mqueryfeature "!check"   if mqueryfeature "!check"
    1538   then   then
    1539   echo "!check detected; src_check() will not be run!" | ${SMAGE_LOG_CMD}   echo "!check detected; src_check() will not be run!" | ${SMAGE_LOG_CMD}
      step_by_step src_check  
    1540   else   else
    1541   src_check | ${SMAGE_LOG_CMD}   ( run_resume src_check || src_check ) | ${SMAGE_LOG_CMD}
    1542   die_pipestatus 0 "src_check failed"   die_pipestatus 0 "src_check failed"
    1543   step_by_step $_   resume_stamp src_check
    1544   fi   fi
    1545     step_by_step src_check
    1546    
    1547   # build several subpackages   # build several subpackages
    1548   if [[ -n ${SPLIT_PACKAGES} ]]   if [[ -n ${SPLIT_PACKAGES} ]]
    # Line 1501  else Line 1566  else
    1566   echo -en " for subpkg: ${COLBLUE}${PNAME}${COLDEFAULT}"   echo -en " for subpkg: ${COLBLUE}${PNAME}${COLDEFAULT}"
    1567   echo -e " - basepkg: ${COLBLUE}${SPLIT_PACKAGE_BASE}${COLDEFAULT} ..."   echo -e " - basepkg: ${COLBLUE}${SPLIT_PACKAGE_BASE}${COLDEFAULT} ..."
    1568    
    1569   src_install_${subpackage} | ${SMAGE_LOG_CMD}   ( run_resume src_install_${subpackage} || src_install_${subpackage} ) | ${SMAGE_LOG_CMD}
    1570   die_pipestatus 0 "src_install_${subpackage} failed"   die_pipestatus 0 "src_install_${subpackage} failed"
    1571   step_by_step $_   resume_stamp src_install_${subpackage}
    1572     step_by_step src_install_${subpackage}
    1573   fi   fi
    1574   done   done
    1575   # restore bindir & pname   # restore bindir & pname
    # Line 1511  else Line 1577  else
    1577   # unset all saved smage variables   # unset all saved smage variables
    1578   split_unset_variables   split_unset_variables
    1579   else   else
    1580   src_install | ${SMAGE_LOG_CMD}   ( run_resume src_install || src_install ) | ${SMAGE_LOG_CMD}
    1581   die_pipestatus 0 "src_install failed"   die_pipestatus 0 "src_install failed"
    1582   step_by_step $_   resume_stamp src_install
    1583     step_by_step src_install
    1584   fi   fi
    1585  fi  fi
    1586    
    # Line 1532  else Line 1599  else
    1599   then   then
    1600   for subpackage in ${SPLIT_PACKAGES}   for subpackage in ${SPLIT_PACKAGES}
    1601   do   do
    1602   mcompressdocs ${BINDIR}_${subpackage}   run_resume post-mcompressdoc_${subpackage} || mcompressdocs ${BINDIR}_${subpackage}
    1603     resume_stamp post-mcompressdoc_${subpackage}
    1604   done   done
    1605   else   else
    1606   mcompressdocs ${BINDIR}   run_resume post-mcompressdoc || mcompressdocs ${BINDIR}
    1607     resume_stamp post-mcompressdoc
    1608   fi   fi
    1609  fi  fi
    1610    
    # Line 1550  then Line 1619  then
    1619   for subpackage in ${SPLIT_PACKAGES}   for subpackage in ${SPLIT_PACKAGES}
    1620   do   do
    1621   echo -e "${COLBLUE}===${COLGREEN} stripping libtool archives for '${subpackage}' ...${COLDEFAULT}"   echo -e "${COLBLUE}===${COLGREEN} stripping libtool archives for '${subpackage}' ...${COLDEFAULT}"
    1622   mstriplibtoolarchive ${BINDIR}_${subpackage}   run_resume post-mstriplibtoolarchive_${subpackage} || mstriplibtoolarchive ${BINDIR}_${subpackage}
    1623     resume_stamp post-mstriplibtoolarchive_${subpackage}
    1624   done   done
    1625   else   else
    1626   echo -e "${COLBLUE}===${COLGREEN} stripping libtool archives ...${COLDEFAULT}"   echo -e "${COLBLUE}===${COLGREEN} stripping libtool archives ...${COLDEFAULT}"
    1627   mstriplibtoolarchive ${BINDIR}   run_resume post-mstriplibtoolarchive || mstriplibtoolarchive ${BINDIR}
    1628     resume_stamp post-mstriplibtoolarchive
    1629   fi   fi
    1630   fi   fi
    1631  fi  fi
    # Line 1570  then Line 1641  then
    1641   for subpackage in ${SPLIT_PACKAGES}   for subpackage in ${SPLIT_PACKAGES}
    1642   do   do
    1643   echo -e "${COLBLUE}===${COLGREEN} purging all purge targets in '${subpackage}' ...${COLDEFAULT}"   echo -e "${COLBLUE}===${COLGREEN} purging all purge targets in '${subpackage}' ...${COLDEFAULT}"
    1644   mpurgetargets ${BINDIR}_${subpackage}   run_resume post-mpurgetargets_${subpackage} || mpurgetargets ${BINDIR}_${subpackage}
    1645     resume_stamp post-mpurgetargets_${subpackage}
    1646   done   done
    1647   else   else
    1648   echo -e "${COLBLUE}===${COLGREEN} purging all purge targets ...${COLDEFAULT}"   echo -e "${COLBLUE}===${COLGREEN} purging all purge targets ...${COLDEFAULT}"
    1649   mpurgetargets ${BINDIR}   run_resume post-mpurgetargets || mpurgetargets ${BINDIR}
    1650     resume_stamp post-mpurgetargets
    1651   fi   fi
    1652   fi   fi
    1653  fi  fi
    # Line 1592  else Line 1665  else
    1665   for subpackage in ${SPLIT_PACKAGES}   for subpackage in ${SPLIT_PACKAGES}
    1666   do   do
    1667   echo -e "${COLBLUE}===${COLGREEN} stripping binaries for '${subpackage}' ...${COLDEFAULT}"   echo -e "${COLBLUE}===${COLGREEN} stripping binaries for '${subpackage}' ...${COLDEFAULT}"
    1668   mstripbins ${BINDIR}_${subpackage}   run_resume post-mstripbins_${subpackage} || mstripbins ${BINDIR}_${subpackage}
    1669     resume_stamp post-mstripbins_${subpackage}
    1670   echo -e "${COLBLUE}===${COLGREEN} stripping dynamic libraries for '${subpackage}' ...${COLDEFAULT}"   echo -e "${COLBLUE}===${COLGREEN} stripping dynamic libraries for '${subpackage}' ...${COLDEFAULT}"
    1671   mstriplibs ${BINDIR}_${subpackage}   run_resume post-mstriplibs_${subpackage} || mstriplibs ${BINDIR}_${subpackage}
    1672     resume_stamp post-mstriplibs_${subpackage}
    1673   echo -e "${COLBLUE}===${COLGREEN} stripping static libraries for '${subpackage}' ...${COLDEFAULT}"   echo -e "${COLBLUE}===${COLGREEN} stripping static libraries for '${subpackage}' ...${COLDEFAULT}"
    1674   mstripstatic ${BINDIR}_${subpackage}   run_resume post-mstripstatic_${subpackage} || mstripstatic ${BINDIR}_${subpackage}
    1675     resume_stamp post-mstripstatic_${subpackage}
    1676   done   done
    1677   else   else
    1678   echo -e "${COLBLUE}===${COLGREEN} stripping binaries ...${COLDEFAULT}"   echo -e "${COLBLUE}===${COLGREEN} stripping binaries ...${COLDEFAULT}"
    1679   mstripbins ${BINDIR}   run_resume post-mstripbins || mstripbins ${BINDIR}
    1680     resume_stamp post-mstripbins
    1681   echo -e "${COLBLUE}===${COLGREEN} stripping dynamic libraries ...${COLDEFAULT}"   echo -e "${COLBLUE}===${COLGREEN} stripping dynamic libraries ...${COLDEFAULT}"
    1682   mstriplibs ${BINDIR}   run_resume post-mstriplibs || mstriplibs ${BINDIR}
    1683     resume_stamp post-mstriplibs
    1684   echo -e "${COLBLUE}===${COLGREEN} stripping static libraries ...${COLDEFAULT}"   echo -e "${COLBLUE}===${COLGREEN} stripping static libraries ...${COLDEFAULT}"
    1685   mstripstatic ${BINDIR}   run_resume post-mstripstatic || mstripstatic ${BINDIR}
    1686     resume_stamp post-mstripstatic
    1687   fi   fi
    1688  fi  fi
    1689    
    # Line 1621  else Line 1700  else
    1700   if typeset -f ${target}_pkgbuild > /dev/null   if typeset -f ${target}_pkgbuild > /dev/null
    1701   then   then
    1702   # run it   # run it
    1703   ${target}_pkgbuild   run_resume post-${target}_pkgbuild || ${target}_pkgbuild
    1704     resume_stamp post-${target}_pkgbuild
    1705   fi   fi
    1706   # now create the target package   # now create the target package
    1707   ${MLIBDIR}/pkgbuild_dir.sh \   run_resume post-pkg_builddir_${target} || ${MLIBDIR}/pkgbuild_dir.sh \
    1708   "${PNAME}-${target}-${PVER}-${ARCH}-${PBUILD}" \   "${PNAME}-${target}-${PVER}-${ARCH}-${PBUILD}" \
    1709   ${BINDIR} || die "target: ${target} package-build failed"   ${BINDIR} || die "target: ${target} package-build failed"
    1710     resume_stamp post-pkg_builddir_${target}
    1711    
    1712   # build pkg-md5-sum if requested   # build pkg-md5-sum if requested
    1713   generate_package_md5sum \   run_resume post-md5sum_${target} || generate_package_md5sum \
    1714   --pcat "${PCATEGORIE}" \   --pcat "${PCATEGORIE}" \
    1715   --pname "${PNAME}" \   --pname "${PNAME}" \
    1716   --pver "${PVER}" \   --pver "${PVER}" \
    1717   --pbuild "${PBUILD}" \   --pbuild "${PBUILD}" \
    1718   --parch "${ARCH}" \   --parch "${ARCH}" \
    1719   --target "${target}"   --target "${target}"
    1720     resume_stamp post-md5sum_${target}
    1721    
    1722   echo -e "${COLGREEN}\nPackage ${PNAME}-${target}-${PVER}-${ARCH}-${PBUILD} successfully builded.\n${COLDEFAULT}"   echo -e "${COLGREEN}\nPackage ${PNAME}-${target}-${PVER}-${ARCH}-${PBUILD} successfully builded.\n${COLDEFAULT}"
    1723   done   done
    # Line 1657  else Line 1739  else
    1739   if typeset -f ${PNAME}_pkgbuild > /dev/null   if typeset -f ${PNAME}_pkgbuild > /dev/null
    1740   then   then
    1741   # run it   # run it
    1742   ${PNAME}_pkgbuild   run_resume post-${PNAME}_pkgbuild || ${PNAME}_pkgbuild
    1743     resume_stamp post-${PNAME}_pkgbuild
    1744   fi   fi
    1745   # now create the target package   # now create the target package
    1746   ${MLIBDIR}/pkgbuild_dir.sh \   run_resume post-pkg_builddir_${PNAME} || ${MLIBDIR}/pkgbuild_dir.sh \
    1747   "${PNAME}-${PVER}-${ARCH}-${PBUILD}" \   "${PNAME}-${PVER}-${ARCH}-${PBUILD}" \
    1748   "${BINDIR}_${PNAME}" || die "split_package: ${PNAME} package-build failed"   "${BINDIR}_${PNAME}" || die "split_package: ${PNAME} package-build failed"
    1749     resume_stamp post-pkg_builddir_${PNAME}
    1750    
    1751   # build pkg-md5-sum if requested   # build pkg-md5-sum if requested
    1752   generate_package_md5sum \   run_resume post-md5sum_${PNAME} || generate_package_md5sum \
    1753   --pcat "${PCATEGORIE}" \   --pcat "${PCATEGORIE}" \
    1754   --pname "${PNAME}" \   --pname "${PNAME}" \
    1755   --pver "${PVER}" \   --pver "${PVER}" \
    1756   --pbuild "${PBUILD}" \   --pbuild "${PBUILD}" \
    1757   --parch "${ARCH}"   --parch "${ARCH}"
    1758     resume_stamp post-md5sum_${PNAME}
    1759    
    1760   echo -e "${COLGREEN}\nPackage ${PNAME}-${PVER}-${ARCH}-${PBUILD} successfully builded.\n${COLDEFAULT}"   echo -e "${COLGREEN}\nPackage ${PNAME}-${PVER}-${ARCH}-${PBUILD} successfully builded.\n${COLDEFAULT}"
    1761    
    # Line 1681  else Line 1766  else
    1766   split_unset_variables   split_unset_variables
    1767    
    1768   else   else
    1769   ${MLIBDIR}/pkgbuild_dir.sh ${PKGNAME} ${BINDIR} || die "package-build failed"   run_resume post-pkg_builddir || ${MLIBDIR}/pkgbuild_dir.sh ${PKGNAME} ${BINDIR} || die "package-build failed"
    1770     resume_stamp post-pkg_builddir
    1771    
    1772   # build pkg-md5-sum if requested   # build pkg-md5-sum if requested
    1773   generate_package_md5sum \   run_resume post-md5sum || generate_package_md5sum \
    1774   --pcat "${PCATEGORIE}" \   --pcat "${PCATEGORIE}" \
    1775   --pname "${PNAME}" \   --pname "${PNAME}" \
    1776   --pver "${PVER}" \   --pver "${PVER}" \
    1777   --pbuild "${PBUILD}" \   --pbuild "${PBUILD}" \
    1778   --parch "${ARCH}"   --parch "${ARCH}"
    1779     resume_stamp post-md5sum
    1780    
    1781   echo -e "${COLGREEN}\nPackage ${PKGNAME} successfully builded.\n${COLDEFAULT}"   echo -e "${COLGREEN}\nPackage ${PKGNAME} successfully builded.\n${COLDEFAULT}"
    1782   fi   fi
    1783    
    1784   # build src-pkg-tarball if requested   # build src-pkg-tarball if requested
    1785   mqueryfeature "srcpkg" && source_pkg_build ${SMAGENAME}   if mqueryfeature "srcpkgbuild"
    1786     then
    1787     run_resume post-srcpkgbuild || source_pkg_build ${SMAGENAME}
    1788     resume_stamp post-srcpkgbuild
    1789     fi
    1790  fi  fi
    1791    
    1792  if mqueryfeature "buildlog"  if mqueryfeature "buildlog"
    Legend:
    Removed from v.1616  
    changed lines
      Added in v.1639