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 29794 by niro, Thu Oct 12 11:37:16 2017 UTC revision 29795 by niro, Thu Oct 12 11:55:58 2017 UTC
    # Line 7  export MULTILIB_BUILD="true" Line 7  export MULTILIB_BUILD="true"
    7  # be verbose or nor (true|false}  # be verbose or nor (true|false}
    8  : ${MULTILIB_VERBOSE="true"}  : ${MULTILIB_VERBOSE="true"}
    9    
     # enter SRCDIR of each abi an abi runs  
     : ${ABI_DO_NOT_ENTER_SRCDIR="true"}  
       
    10  # multilib should call all dependant includes, which gets overridden  # multilib should call all dependant includes, which gets overridden
    11  sminclude mtools  sminclude mtools
    12    
    # Line 116  abi-m32() Line 113  abi-m32()
    113   fi   fi
    114    
    115   # run any given command   # run any given command
    116     if [[ ${MULTILIB_VERBOSE} = true ]]
    117     then
    118     echo -e "${COLGREEN}Executing:${COLDEFAULT} '$@'"
    119     fi
    120   eval $@ || die   eval $@ || die
    121    
    122   unset ABI CC CXX ABI_LIBDIR   unset ABI CC CXX ABI_LIBDIR
    # Line 165  abi-m64() Line 166  abi-m64()
    166   fi   fi
    167    
    168   # run any given command   # run any given command
    169     if [[ ${MULTILIB_VERBOSE} = true ]]
    170     then
    171     echo -e "${COLGREEN}Executing:${COLDEFAULT} '$@'"
    172     fi
    173   eval $@ || die   eval $@ || die
    174    
    175   unset ABI CC CXX ABI_LIBDIR   unset ABI CC CXX ABI_LIBDIR
    # Line 185  only-m32() Line 190  only-m32()
    190   # export this for mpatch etc (to repect only-${abi})   # export this for mpatch etc (to repect only-${abi})
    191   export MULTILIB_ONLY_ABI=${abi}   export MULTILIB_ONLY_ABI=${abi}
    192    
    193   if [[ ${ABI_DO_NOT_ENTER_SRCDIR} != true ]]   cd ${SRCDIR}-${abi}/${SRCSUBDIR}
      then  
      cd ${SRCDIR}-${abi}/${SRCSUBDIR}  
      fi  
    194   abi-${abi} $@ || die   abi-${abi} $@ || die
    195    
    196   # unset this is very important   # unset this is very important
    # Line 209  only-m64() Line 211  only-m64()
    211   # export this for mpatch etc (to repect only-${abi})   # export this for mpatch etc (to repect only-${abi})
    212   export MULTILIB_ONLY_ABI=${abi}   export MULTILIB_ONLY_ABI=${abi}
    213    
    214   if [[ ${ABI_DO_NOT_ENTER_SRCDIR} != true ]]   cd ${SRCDIR}-${abi}/${SRCSUBDIR}
      then  
      cd ${SRCDIR}-${abi}/${SRCSUBDIR}  
      fi  
    215   abi-${abi} $@ || die   abi-${abi} $@ || die
    216    
    217   # unset this is very important   # unset this is very important
    # Line 226  all-abis() Line 225  all-abis()
    225   local abi   local abi
    226   for abi in ${MULTILIB_ABIS}   for abi in ${MULTILIB_ABIS}
    227   do   do
    228   if [[ ${ABI_DO_NOT_ENTER_SRCDIR} != true ]]   cd ${SRCDIR}-${abi}/${SRCSUBDIR}
      then  
      cd ${SRCDIR}-${abi}/${SRCSUBDIR}  
      fi  
    229   abi-${abi} $@ || die   abi-${abi} $@ || die
    230   done   done
    231  }  }
    Legend:
    Removed from v.29794  
    changed lines
      Added in v.29795