Magellan Linux

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

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

revision 196 by niro, Sat Aug 20 15:55:19 2005 UTC revision 200 by niro, Sun Aug 21 21:36:54 2005 UTC
# Line 4  Line 4 
4  # needs pkgbuild_dir (mage)  # needs pkgbuild_dir (mage)
5    
6  # SMAGE2  # SMAGE2
7  # $Header: /home/cvsd/magellan-cvs/magellan-src/mage/usr/lib/mage/smage2.sh,v 1.27 2005-08-20 15:55:19 niro Exp $  # $Header: /home/cvsd/magellan-cvs/magellan-src/mage/usr/lib/mage/smage2.sh,v 1.31 2005-08-21 21:36:54 niro Exp $
8    
9  #01.10.2004  #01.10.2004
10  # added ccache support  # added ccache support
# Line 408  setup_ccache_environment(){ Line 408  setup_ccache_environment(){
408    
409    
410  # fixes given dependencies to match a MAGE_TARGET  # fixes given dependencies to match a MAGE_TARGET
411  # fix_mage_deps target s/depend  # fix_mage_deps -target s/depend # <-- note -target !
412  fix_mage_deps() {  fix_mage_deps() {
413   local target="$1"   local target="$1"
414   local depend="$2"   local depend="$2"
# Line 425  fix_mage_deps() { Line 425  fix_mage_deps() {
425   while read sym dep   while read sym dep
426   do   do
427   cat="$(dirname ${dep})"   cat="$(dirname ${dep})"
428   # abort on virtual   # change if not virtual
429   [[ ${cat} = virtual ]] && continue   if [[ ${cat} = virtual ]]
430     then
431   # fix pver to target-pver   pname="$(basename ${dep})"
432   # to get pname-target-pver   else
433     # fix pver to target-pver
434     # to get pname-target-pver
435    
436   # doing it backwards !   # doing it backwards !
437   pver="${dep##*-}"   pver="${dep##*-}"
438   pname=$(basename ${dep/-${pver}/})   # full pver
439     pname="$(basename ${dep/-${pver}/})${target}-${pver}"
440     fi
441    
442   # do not add empty lines   # do not add empty lines
443   if [ -z "${NDEPEND}" ]   if [ -z "${NDEPEND}" ]
444   then   then
445   NDEPEND="${sym} ${cat}/${pname}-${target}-${pver}"   NDEPEND="${sym} ${cat}/${pname}"
446   else   else
447   NDEPEND="${NDEPEND}   NDEPEND="${NDEPEND}
448   ${sym} ${cat}/${pname}-${target}-${pver}"   ${sym} ${cat}/${pname}${target}"
449   fi   fi
450    
451   unset cat pname pver   unset cat pname pver
# Line 508  build_mage_script() Line 512  build_mage_script()
512   > ${dest}   > ${dest}
513    
514   # header   # header
515   echo '# $Header: /home/cvsd/magellan-cvs/magellan-src/mage/usr/lib/mage/smage2.sh,v 1.27 2005-08-20 15:55:19 niro Exp $' >> ${dest}   echo '# $Header: /home/cvsd/magellan-cvs/magellan-src/mage/usr/lib/mage/smage2.sh,v 1.31 2005-08-21 21:36:54 niro Exp $' >> ${dest}
516   echo  >> ${dest}   echo  >> ${dest}
517    
518   # pgkname and state   # pgkname and state
# Line 523  build_mage_script() Line 527  build_mage_script()
527    
528   # special tags and vars   # special tags and vars
529   echo "PKGTYPE=\"${PKGTYPE}\""  >> ${dest}   echo "PKGTYPE=\"${PKGTYPE}\""  >> ${dest}
530   if [ -n "${INHERITS}" ]   # add special vars
531     if [ -n "${SPECIAL_VARS}" ]
532   then   then
  echo -n "minclude"  >> ${dest}  
533   local i   local i
534   for i in ${INHERITS}   for i in ${SPECIAL_VARS}
535   do   do
536   echo -n " ${i}"  >> ${dest}   # being tricky here :)
537     echo "${i}=\"$(eval echo \$${i})\"" >> ${dest}
538   done   done
539   echo  >> ${dest}   echo  >> ${dest}
540   fi   fi
541   echo >> ${dest}   # add at least all includes
542     if [ -n "${INHERITS}" ]
  # add special vars  
  if [ -n "${SPECIAL_VARS}" ]  
543   then   then
544     echo -n "minclude"  >> ${dest}
545   local i   local i
546   for i in ${SPECIAL_VARS}   for i in ${INHERITS}
547   do   do
548   # being tricky here :)   echo -n " ${i}"  >> ${dest}
  echo "${i}=\"$(eval echo \$${i})\"" >> ${dest}  
549   done   done
550   echo  >> ${dest}   echo  >> ${dest}
551   fi   fi
552     echo >> ${dest}
553    
554   # deps and provides   # deps and provides
555   echo "DEPEND=\"$(fix_mage_deps "${target}" "${DEPEND}")\"" >> ${dest}   echo "DEPEND=\"$(fix_mage_deps "${target}" "${DEPEND}")\"" >> ${dest}

Legend:
Removed from v.196  
changed lines
  Added in v.200