Magellan Linux

  • Back to homepage
    • /[smage]/trunk/include/multilib.sminc

    Diff of /trunk/include/multilib.sminc

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

    revision 20986 by niro, Wed Feb 19 12:23:44 2014 UTC revision 20987 by niro, Mon Mar 3 09:56:03 2014 UTC
    # Line 261  then Line 261  then
    261   # rename the old one   # rename the old one
    262   old_mconfigure=old$(typeset -f mconfigure)   old_mconfigure=old$(typeset -f mconfigure)
    263   eval "${old_mconfigure}"   eval "${old_mconfigure}"
    264  fi  
    265  mconfigure()  mconfigure()
    266  {  {
    267   local abi   local abi
    # Line 276  mconfigure() Line 276  mconfigure()
    276   abi-${abi} oldmconfigure $@ || die   abi-${abi} oldmconfigure $@ || die
    277   done   done
    278  }  }
    279    fi
    280    
    281  if [[ ! -z $(typeset -f cmake_configure) ]]  if [[ ! -z $(typeset -f cmake_configure) ]]
    282  then  then
    283   # rename the old one   # rename the old one
    284   old_cmake_configure=old$(typeset -f cmake_configure)   old_cmake_configure=old$(typeset -f cmake_configure)
    285   eval "${old_cmake_configure}"   eval "${old_cmake_configure}"
    286  fi  
    287  cmake_configure()  cmake_configure()
    288  {  {
    289   local abi   local abi
    # Line 301  cmake_configure() Line 302  cmake_configure()
    302   # restore SRCDIR   # restore SRCDIR
    303   SRCDIR="${saved_SRCDIR}"   SRCDIR="${saved_SRCDIR}"
    304  }  }
    305    fi
    306    
    307  if [[ ! -z $(typeset -f cmake_src_compile) ]]  if [[ ! -z $(typeset -f cmake_src_compile) ]]
    308  then  then
    309   # rename the old one   # rename the old one
    310   old_cmake_src_compile=old$(typeset -f cmake_src_compile)   old_cmake_src_compile=old$(typeset -f cmake_src_compile)
    311   eval "${old_cmake_src_compile}"   eval "${old_cmake_src_compile}"
    312  fi  
    313  cmake_src_compile()  cmake_src_compile()
    314  {  {
    315   local abi   local abi
    # Line 334  cmake_src_compile() Line 336  cmake_src_compile()
    336   abi-${abi} oldmmake $@ || die   abi-${abi} oldmmake $@ || die
    337   done   done
    338  }  }
    339    fi
    340    
    341  if [[ ! -z $(typeset -f cmake_src_check) ]]  if [[ ! -z $(typeset -f cmake_src_check) ]]
    342  then  then
    343   # rename the old one   # rename the old one
    344   old_cmake_src_check=old$(typeset -f cmake_src_check)   old_cmake_src_check=old$(typeset -f cmake_src_check)
    345   eval "${old_cmake_check}"   eval "${old_cmake_check}"
    346  fi  
    347  cmake_src_check()  cmake_src_check()
    348  {  {
    349   local abi   local abi
    # Line 355  cmake_src_check() Line 358  cmake_src_check()
    358   mmake -j1 -k check || die   mmake -j1 -k check || die
    359   done   done
    360  }  }
    361    fi
    362    
    363  if [[ ! -z $(typeset -f cmake_src_install) ]]  if [[ ! -z $(typeset -f cmake_src_install) ]]
    364  then  then
    365   # rename the old one   # rename the old one
    366   old_cmake_src_install=old$(typeset -f cmake_src_install)   old_cmake_src_install=old$(typeset -f cmake_src_install)
    367   eval "${old_cmake_install}"   eval "${old_cmake_install}"
    368  fi  
    369  cmake_src_install()  cmake_src_install()
    370  {  {
    371   local abi   local abi
    # Line 377  cmake_src_install() Line 381  cmake_src_install()
    381   abi-${abi} oldmmake DESTDIR=${BINDIR} $@ install || die   abi-${abi} oldmmake DESTDIR=${BINDIR} $@ install || die
    382   done   done
    383  }  }
    384    fi
    385    
    386  if [[ ! -z $(typeset -f munpack) ]]  if [[ ! -z $(typeset -f munpack) ]]
    387  then  then
    388   # rename the old one   # rename the old one
    389   old_munpack=old$(typeset -f munpack)   old_munpack=old$(typeset -f munpack)
    390   eval "${old_munpack}"   eval "${old_munpack}"
    391  fi  
    392  munpack()  munpack()
    393  {  {
    394   local abi   local abi
    # Line 399  munpack() Line 404  munpack()
    404   mv ${SRCDIR} ${SRCDIR}-${abi} || die   mv ${SRCDIR} ${SRCDIR}-${abi} || die
    405   done   done
    406  }  }
    407    fi
    408    
    409  if [[ ! -z $(typeset -f mmake) ]]  if [[ ! -z $(typeset -f mmake) ]]
    410  then  then
    411   # rename the old one   # rename the old one
    412   old_mmake=old$(typeset -f mmake)   old_mmake=old$(typeset -f mmake)
    413   eval "${old_mmake}"   eval "${old_mmake}"
    414  fi  
    415  mmake()  mmake()
    416  {  {
    417   local abi   local abi
    # Line 421  mmake() Line 427  mmake()
    427   abi-${abi} oldmmake $@ || die   abi-${abi} oldmmake $@ || die
    428   done   done
    429  }  }
    430    fi
    431    
    432  if [[ ! -z $(typeset -f minstall) ]]  if [[ ! -z $(typeset -f minstall) ]]
    433  then  then
    434   # rename the old one   # rename the old one
    435   old_minstall=old$(typeset -f minstall)   old_minstall=old$(typeset -f minstall)
    436   eval "${old_minstall}"   eval "${old_minstall}"
    437  fi  
    438  minstall()  minstall()
    439  {  {
    440   local abi   local abi
    # Line 443  minstall() Line 450  minstall()
    450   abi-${abi} oldminstall $@ || die   abi-${abi} oldminstall $@ || die
    451   done   done
    452  }  }
    453    fi
    454    
    455  minstall_destdir()  minstall_destdir()
    456  {  {
    # Line 465  then Line 473  then
    473   # rename the old one   # rename the old one
    474   old_mpatch=old$(typeset -f mpatch)   old_mpatch=old$(typeset -f mpatch)
    475   eval "${old_mpatch}"   eval "${old_mpatch}"
    476  fi  
    477  mpatch()  mpatch()
    478  {  {
    479   local abi   local abi
    # Line 481  mpatch() Line 489  mpatch()
    489   oldmpatch $@ || die   oldmpatch $@ || die
    490   done   done
    491  }  }
    492    fi
    493    
    494  if [[ ! -z $(typeset -f mlibtoolize) ]]  if [[ ! -z $(typeset -f mlibtoolize) ]]
    495  then  then
    496   # rename the old one   # rename the old one
    497   old_mlibtoolize=old$(typeset -f mlibtoolize)   old_mlibtoolize=old$(typeset -f mlibtoolize)
    498   eval "${old_mlibtoolize}"   eval "${old_mlibtoolize}"
    499  fi  
    500  mlibtoolize()  mlibtoolize()
    501  {  {
    502   local abi   local abi
    # Line 503  mlibtoolize() Line 512  mlibtoolize()
    512   oldmlibtoolize $@ || die   oldmlibtoolize $@ || die
    513   done   done
    514  }  }
    515    fi
    516    
    517  if [[ ! -z $(typeset -f mautoreconf) ]]  if [[ ! -z $(typeset -f mautoreconf) ]]
    518  then  then
    519   # rename the old one   # rename the old one
    520   old_mautoreconf=old$(typeset -f mautoreconf)   old_mautoreconf=old$(typeset -f mautoreconf)
    521   eval "${old_mautoreconf}"   eval "${old_mautoreconf}"
    522  fi  
    523  mautoreconf()  mautoreconf()
    524  {  {
    525   local abi   local abi
    # Line 525  mautoreconf() Line 535  mautoreconf()
    535   oldmautoreconf $@ || die   oldmautoreconf $@ || die
    536   done   done
    537  }  }
    538    fi
    539    
    540  if [[ ! -z $(typeset -f minstalldocs) ]]  if [[ ! -z $(typeset -f minstalldocs) ]]
    541  then  then
    542   # rename the old one   # rename the old one
    543   old_minstalldocs=old$(typeset -f minstalldocs)   old_minstalldocs=old$(typeset -f minstalldocs)
    544   eval "${old_minstalldocs}"   eval "${old_minstalldocs}"
    545  fi  
    546  minstalldocs()  minstalldocs()
    547  {  {
    548   local abi   local abi
    # Line 548  minstalldocs() Line 559  minstalldocs()
    559   oldminstalldocs $@ || die   oldminstalldocs $@ || die
    560   done   done
    561  }  }
    562    fi
    563    
    564  ##  ##
    565  # multilib mbuild wrappers  # multilib mbuild wrappers
    Legend:
    Removed from v.20986  
    changed lines
      Added in v.20987