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 307 by niro, Mon Dec 22 11:33:39 2008 UTC revision 5486 by niro, Tue Jun 29 23:17:45 2010 UTC
    # Line 65  abi-m32() Line 65  abi-m32()
    65   then   then
    66   export LDFLAGS="-L/${ABI_LIBDIR} -L/usr/${ABI_LIBDIR}"   export LDFLAGS="-L/${ABI_LIBDIR} -L/usr/${ABI_LIBDIR}"
    67   fi   fi
    68   export PKG_CONFIG_PATH="/usr/${ABI_LIBDIR}/pkgconfig"   # keep pkgconfig clean
    69     local orig_pkg_config_path="${PKG_CONFIG_PATH}"
    70     export PKG_CONFIG_PATH="/usr/${ABI_LIBDIR}/pkgconfig:${PKG_CONFIG_PATH}"
    71    
    72   echo -e "${COLBLUE}*** ${COLGREEN}running with -${ABI} ABI${COLDEFAULT}"   echo -e "${COLBLUE}*** ${COLGREEN}running with -${ABI} ABI${COLDEFAULT}"
    73   echo -e "${COLBLUE}*** ${COLGREEN}  ABI${COLDEFAULT}='${ABI}'"   echo -e "${COLBLUE}*** ${COLGREEN}  ABI${COLDEFAULT}='${ABI}'"
    # Line 92  abi-m32() Line 94  abi-m32()
    94   # run any given command   # run any given command
    95   eval $@ || die   eval $@ || die
    96    
    97   unset ABI CC CXX ABI_LIBDIR LDFLAGS PKG_CONFIG_PATH   unset ABI CC CXX ABI_LIBDIR LDFLAGS
    98     # keep pkgconfig clean
    99     export PKG_CONFIG_PATH="${orig_pkg_config_path}"
    100    
    101   # restore original settings   # restore original settings
    102   if [[ ${EMUL_LINUX_32} = true ]]   if [[ ${EMUL_LINUX_32} = true ]]
    # Line 112  abi-m64() Line 116  abi-m64()
    116   then   then
    117   export LDFLAGS="-L/${ABI_LIBDIR} -L/usr/${ABI_LIBDIR}"   export LDFLAGS="-L/${ABI_LIBDIR} -L/usr/${ABI_LIBDIR}"
    118   fi   fi
    119   export PKG_CONFIG_PATH="/usr/${ABI_LIBDIR}/pkgconfig"   # keep pkgconfig clean
    120     local orig_pkg_config_path="${PKG_CONFIG_PATH}"
    121     export PKG_CONFIG_PATH="/usr/${ABI_LIBDIR}/pkgconfig:${PKG_CONFIG_PATH}"
    122    
    123   echo -e "${COLBLUE}*** ${COLGREEN}running with -${ABI} ABI${COLDEFAULT}"   echo -e "${COLBLUE}*** ${COLGREEN}running with -${ABI} ABI${COLDEFAULT}"
    124   echo -e "${COLBLUE}*** ${COLGREEN}  ABI${COLDEFAULT}='${ABI}'"   echo -e "${COLBLUE}*** ${COLGREEN}  ABI${COLDEFAULT}='${ABI}'"
    # Line 131  abi-m64() Line 137  abi-m64()
    137   # run any given command   # run any given command
    138   eval $@ || die   eval $@ || die
    139    
    140   unset ABI CC CXX ABI_LIBDIR LDFLAGS PKG_CONFIG_PATH   unset ABI CC CXX ABI_LIBDIR LDFLAGS
    141     # keep pkgconfig clean
    142     export PKG_CONFIG_PATH="${orig_pkg_config_path}"
    143  }  }
    144    
    145  only-m32()  only-m32()
    # Line 190  all-abis() Line 198  all-abis()
    198  # multilib compile functions  # multilib compile functions
    199  ##  ##
    200    
    201  # rename the old one  if [[ ! -z $(typeset -f mconfigure) ]]
    202  old_mconfigure=old$(typeset -f mconfigure)  then
    203  eval ${old_mconfigure}   # rename the old one
    204     old_mconfigure=old$(typeset -f mconfigure)
    205     eval "${old_mconfigure}"
    206    fi
    207  mconfigure()  mconfigure()
    208  {  {
    209   local abi   local abi
    # Line 208  mconfigure() Line 219  mconfigure()
    219   done   done
    220  }  }
    221    
    222  # rename the old one  if [[ ! -z $(typeset -f cmake_configure) ]]
    223  old_munpack=old$(typeset -f munpack)  then
    224  eval "${old_munpack}"   # rename the old one
    225     old_cmake_configure=old$(typeset -f cmake_configure)
    226     eval "${old_cmake_configure}"
    227    fi
    228    cmake_configure()
    229    {
    230     local abi
    231     local abis_to_run="${MULTILIB_ABIS}"
    232    
    233     # respect MULTILIB_ONLY_ABI variable
    234     [[ ! -z ${MULTILIB_ONLY_ABI} ]] && abis_to_run="${MULTILIB_ONLY_ABI}"
    235    
    236     local saved_SRCDIR="${SRCDIR}"
    237     for abi in ${abis_to_run}
    238     do
    239     SRCDIR="${saved_SRCDIR}-${abi}"
    240     cd ${SRCDIR}
    241     abi-${abi} oldcmake_configure $@ || die
    242     done
    243    }
    244    
    245    if [[ ! -z $(typeset -f munpack) ]]
    246    then
    247     # rename the old one
    248     old_munpack=old$(typeset -f munpack)
    249     eval "${old_munpack}"
    250    fi
    251  munpack()  munpack()
    252  {  {
    253   local abi   local abi
    # Line 227  munpack() Line 264  munpack()
    264   done   done
    265  }  }
    266    
    267  # rename the old one  if [[ ! -z $(typeset -f mmake) ]]
    268  old_mmake=old$(typeset -f mmake)  then
    269  eval "${old_mmake}"   # rename the old one
    270     old_mmake=old$(typeset -f mmake)
    271     eval "${old_mmake}"
    272    fi
    273  mmake()  mmake()
    274  {  {
    275   local abi   local abi
    # Line 246  mmake() Line 286  mmake()
    286   done   done
    287  }  }
    288    
    289  # rename the old one  if [[ ! -z $(typeset -f minstall) ]]
    290  old_minstall=old$(typeset -f minstall)  then
    291  eval "${old_minstall}"   # rename the old one
    292     old_minstall=old$(typeset -f minstall)
    293     eval "${old_minstall}"
    294    fi
    295  minstall()  minstall()
    296  {  {
    297   local abi   local abi
    # Line 281  minstall_destdir() Line 324  minstall_destdir()
    324   done   done
    325  }  }
    326    
    327  # rename the old one  if [[ ! -z $(typeset -f mpatch) ]]
    328  old_mpatch=old$(typeset -f mpatch)  then
    329  eval "${old_mpatch}"   # rename the old one
    330     old_mpatch=old$(typeset -f mpatch)
    331     eval "${old_mpatch}"
    332    fi
    333  mpatch()  mpatch()
    334  {  {
    335   local abi   local abi
    # Line 300  mpatch() Line 346  mpatch()
    346   done   done
    347  }  }
    348    
    349  # rename the old one  if [[ ! -z $(typeset -f mlibtoolize) ]]
    350  old_mlibtoolize=old$(typeset -f mlibtoolize)  then
    351  eval "${old_mlibtoolize}"   # rename the old one
    352     old_mlibtoolize=old$(typeset -f mlibtoolize)
    353     eval "${old_mlibtoolize}"
    354    fi
    355  mlibtoolize()  mlibtoolize()
    356  {  {
    357   local abi   local abi
    Legend:
    Removed from v.307  
    changed lines
      Added in v.5486