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 22067 by niro, Fri Aug 22 12:29:21 2014 UTC revision 29792 by niro, Thu Oct 12 11:37:16 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    
    10    # enter SRCDIR of each abi an abi runs
    11    : ${ABI_DO_NOT_ENTER_SRCDIR="true"}
    12    
    13  # multilib should call all dependant includes, which gets overridden  # multilib should call all dependant includes, which gets overridden
    14  sminclude mtools  sminclude mtools
    15    
    # Line 42  then Line 45  then
    45   # the var ist decided with our common eval+echo magic   # the var ist decided with our common eval+echo magic
    46   if [[ -z ${SDEPEND} ]]   if [[ -z ${SDEPEND} ]]
    47   then   then
    48   SDEPEND="\$(eval echo \\\$EMUL_LINUX_32_SDEPEND_\${ARCH/i*86/x86} | tr ';' '\n')"   SDEPEND="$(marchsdepend EMUL_LINUX_32_SDEPEND)"
    49   else   else
    50   SDEPEND="${SDEPEND}   SDEPEND="${SDEPEND}
    51   \$(eval echo \\\$EMUL_LINUX_32_SDEPEND_\${ARCH/i*86/x86} | tr ';' '\n')"   $(marchsdepend EMUL_LINUX_32_SDEPEND)"
    52   fi   fi
    53  fi  fi
    54    
    # Line 182  only-m32() Line 185  only-m32()
    185   # export this for mpatch etc (to repect only-${abi})   # export this for mpatch etc (to repect only-${abi})
    186   export MULTILIB_ONLY_ABI=${abi}   export MULTILIB_ONLY_ABI=${abi}
    187    
    188   cd ${SRCDIR}-${abi}/${SRCSUBDIR}   if [[ ${ABI_DO_NOT_ENTER_SRCDIR} != true ]]
    189     then
    190     cd ${SRCDIR}-${abi}/${SRCSUBDIR}
    191     fi
    192   abi-${abi} $@ || die   abi-${abi} $@ || die
    193    
    194   # unset this is very important   # unset this is very important
    # Line 203  only-m64() Line 209  only-m64()
    209   # export this for mpatch etc (to repect only-${abi})   # export this for mpatch etc (to repect only-${abi})
    210   export MULTILIB_ONLY_ABI=${abi}   export MULTILIB_ONLY_ABI=${abi}
    211    
    212   cd ${SRCDIR}-${abi}/${SRCSUBDIR}   if [[ ${ABI_DO_NOT_ENTER_SRCDIR} != true ]]
    213     then
    214     cd ${SRCDIR}-${abi}/${SRCSUBDIR}
    215     fi
    216   abi-${abi} $@ || die   abi-${abi} $@ || die
    217    
    218   # unset this is very important   # unset this is very important
    # Line 217  all-abis() Line 226  all-abis()
    226   local abi   local abi
    227   for abi in ${MULTILIB_ABIS}   for abi in ${MULTILIB_ABIS}
    228   do   do
    229   cd ${SRCDIR}-${abi}/${SRCSUBDIR}   if [[ ${ABI_DO_NOT_ENTER_SRCDIR} != true ]]
    230     then
    231     cd ${SRCDIR}-${abi}/${SRCSUBDIR}
    232     fi
    233   abi-${abi} $@ || die   abi-${abi} $@ || die
    234   done   done
    235  }  }
    # Line 301  cmake_configure() Line 313  cmake_configure()
    313   then   then
    314   cd ${BUILDDIR}/build-${abi}   cd ${BUILDDIR}/build-${abi}
    315   else   else
    316   cd ${SRCDIR}-${abi}   cd ${SRCDIR}
    317   fi   fi
    318   abi-${abi} oldcmake_configure $@ || die   abi-${abi} oldcmake_configure $@ || die
    319   done   done
    Legend:
    Removed from v.22067  
    changed lines
      Added in v.29792