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 29801 by niro, Thu Oct 12 13:30:10 2017 UTC revision 31852 by niro, Thu Dec 20 13:40:54 2018 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 the abi srcdir as default setting
    11    : ${MULTILIB_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 79  abi-m32() Line 82  abi-m32()
    82   local orig_pkg_config_path="${PKG_CONFIG_PATH}"   local orig_pkg_config_path="${PKG_CONFIG_PATH}"
    83   export PKG_CONFIG_PATH="/usr/${ABI_LIBDIR}/pkgconfig:${PKG_CONFIG_PATH}"   export PKG_CONFIG_PATH="/usr/${ABI_LIBDIR}/pkgconfig:${PKG_CONFIG_PATH}"
    84    
    85     # honor rust
    86     case ${ARCH} in
    87     # use native abi as RUST_TARGET
    88     i686) export RUST_TARGET="${ARCH}-unknown-linux-gnu" ;;
    89     # use i686 as RUST_TARGET for i{3,4,5}86 targets and on multilib-x86_64 target too
    90     i*86|x86_64) export RUST_TARGET="i686-unknown-linux-gnu" ;;
    91     *)  die "unknown RUST_TARGET '${ARCH}'" ;;
    92     esac
    93    
    94   if [[ ${MULTILIB_VERBOSE} = true ]]   if [[ ${MULTILIB_VERBOSE} = true ]]
    95   then   then
    96   echo -e "${COLBLUE}*** ${COLGREEN}running with -${ABI} ABI${COLDEFAULT}"   echo -e "${COLBLUE}*** ${COLGREEN}running with -${ABI} ABI${COLDEFAULT}"
    # Line 119  abi-m32() Line 131  abi-m32()
    131   fi   fi
    132   eval $@ || die   eval $@ || die
    133    
    134   unset ABI CC CXX ABI_LIBDIR   unset ABI CC CXX ABI_LIBDIR RUST_TARGET
    135   # keep pkgconfig clean   # keep pkgconfig clean
    136   export PKG_CONFIG_PATH="${orig_pkg_config_path}"   export PKG_CONFIG_PATH="${orig_pkg_config_path}"
    137   export LDFLAGS="${saved_ldflags}"   export LDFLAGS="${saved_ldflags}"
    # Line 147  abi-m64() Line 159  abi-m64()
    159   local orig_pkg_config_path="${PKG_CONFIG_PATH}"   local orig_pkg_config_path="${PKG_CONFIG_PATH}"
    160   export PKG_CONFIG_PATH="/usr/${ABI_LIBDIR}/pkgconfig:${PKG_CONFIG_PATH}"   export PKG_CONFIG_PATH="/usr/${ABI_LIBDIR}/pkgconfig:${PKG_CONFIG_PATH}"
    161    
    162     # honor rust
    163     case ${ARCH} in
    164     # use native abi as RUST_TARGET
    165     x86_64) export RUST_TARGET="${ARCH}-unknown-linux-gnu" ;;
    166     *)  die "unknown RUST_TARGET '${ARCH}'" ;;
    167     esac
    168    
    169   if [[ ${MULTILIB_VERBOSE} = true ]]   if [[ ${MULTILIB_VERBOSE} = true ]]
    170   then   then
    171   echo -e "${COLBLUE}*** ${COLGREEN}running with -${ABI} ABI${COLDEFAULT}"   echo -e "${COLBLUE}*** ${COLGREEN}running with -${ABI} ABI${COLDEFAULT}"
    # Line 172  abi-m64() Line 191  abi-m64()
    191   fi   fi
    192   eval $@ || die   eval $@ || die
    193    
    194   unset ABI CC CXX ABI_LIBDIR   unset ABI CC CXX ABI_LIBDIR RUST_TARGET
    195   # keep pkgconfig clean   # keep pkgconfig clean
    196   export PKG_CONFIG_PATH="${orig_pkg_config_path}"   export PKG_CONFIG_PATH="${orig_pkg_config_path}"
    197   export LDFLAGS="${saved_ldflags}"   export LDFLAGS="${saved_ldflags}"
    # Line 190  only-m32() Line 209  only-m32()
    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 [[ ${MULTILIB_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 211  only-m64() Line 233  only-m64()
    233   # export this for mpatch etc (to repect only-${abi})   # export this for mpatch etc (to repect only-${abi})
    234   export MULTILIB_ONLY_ABI=${abi}   export MULTILIB_ONLY_ABI=${abi}
    235    
    236   cd ${SRCDIR}-${abi}/${SRCSUBDIR}   if [[ ${MULTILIB_ENTER_SRCDIR} = true ]]
    237     then
    238     cd ${SRCDIR}-${abi}/${SRCSUBDIR}
    239     fi
    240   abi-${abi} $@ || die   abi-${abi} $@ || die
    241    
    242   # unset this is very important   # unset this is very important
    # Line 225  all-abis() Line 250  all-abis()
    250   local abi   local abi
    251   for abi in ${MULTILIB_ABIS}   for abi in ${MULTILIB_ABIS}
    252   do   do
    253   cd ${SRCDIR}-${abi}/${SRCSUBDIR}   if [[ ${MULTILIB_ENTER_SRCDIR} = true ]]
    254     then
    255     cd ${SRCDIR}-${abi}/${SRCSUBDIR}
    256     fi
    257   abi-${abi} $@ || die   abi-${abi} $@ || die
    258   done   done
    259  }  }
    # Line 280  mconfigure() Line 308  mconfigure()
    308    
    309   for abi in ${abis_to_run}   for abi in ${abis_to_run}
    310   do   do
    311   cd ${SRCDIR}-${abi}/${SRCSUBDIR}   if [[ ${MULTILIB_ENTER_SRCDIR} = true ]]
    312     then
    313     cd ${SRCDIR}-${abi}/${SRCSUBDIR}
    314     fi
    315   abi-${abi} oldmconfigure $@ || die   abi-${abi} oldmconfigure $@ || die
    316   done   done
    317  }  }
    # Line 326  mmake() Line 357  mmake()
    357   for abi in ${abis_to_run}   for abi in ${abis_to_run}
    358   do   do
    359   echo -e "${COLBLUE}*** ${COLGREEN}compiling for ABI -${abi}${COLDEFAULT}"   echo -e "${COLBLUE}*** ${COLGREEN}compiling for ABI -${abi}${COLDEFAULT}"
    360   cd ${SRCDIR}-${abi}/${SRCSUBDIR}   if [[ ${MULTILIB_ENTER_SRCDIR} = true ]]
    361     then
    362     cd ${SRCDIR}-${abi}/${SRCSUBDIR}
    363     fi
    364   abi-${abi} oldmmake $@ || die   abi-${abi} oldmmake $@ || die
    365   done   done
    366  }  }
    # Line 349  minstall() Line 383  minstall()
    383   for abi in ${abis_to_run}   for abi in ${abis_to_run}
    384   do   do
    385   echo -e "${COLBLUE}*** ${COLGREEN}installing for ABI -${abi}${COLDEFAULT}"   echo -e "${COLBLUE}*** ${COLGREEN}installing for ABI -${abi}${COLDEFAULT}"
    386   cd ${SRCDIR}-${abi}/${SRCSUBDIR}   if [[ ${MULTILIB_ENTER_SRCDIR} = true ]]
    387     then
    388     cd ${SRCDIR}-${abi}/${SRCSUBDIR}
    389     fi
    390   abi-${abi} oldminstall $@ || die   abi-${abi} oldminstall $@ || die
    391   done   done
    392  }  }
    # Line 366  minstall_destdir() Line 403  minstall_destdir()
    403   for abi in ${abis_to_run}   for abi in ${abis_to_run}
    404   do   do
    405   echo -e "${COLBLUE}*** ${COLGREEN}installing for ABI -${abi}${COLDEFAULT}"   echo -e "${COLBLUE}*** ${COLGREEN}installing for ABI -${abi}${COLDEFAULT}"
    406   cd ${SRCDIR}-${abi}/${SRCSUBDIR}   if [[ ${MULTILIB_ENTER_SRCDIR} = true ]]
    407     then
    408     cd ${SRCDIR}-${abi}/${SRCSUBDIR}
    409     fi
    410   make DESTDIR=${BINDIR} $@ install || die   make DESTDIR=${BINDIR} $@ install || die
    411   done   done
    412  }  }
    # Line 388  mpatch() Line 428  mpatch()
    428   for abi in ${abis_to_run}   for abi in ${abis_to_run}
    429   do   do
    430   echo -e "${COLBLUE}*** ${COLGREEN}appling patch for ABI -${abi}${COLDEFAULT}"   echo -e "${COLBLUE}*** ${COLGREEN}appling patch for ABI -${abi}${COLDEFAULT}"
    431   cd ${SRCDIR}-${abi}/${SRCSUBDIR}   if [[ ${MULTILIB_ENTER_SRCDIR} = true ]]
    432     then
    433     cd ${SRCDIR}-${abi}/${SRCSUBDIR}
    434     fi
    435   oldmpatch $@ || die   oldmpatch $@ || die
    436   done   done
    437  }  }
    # Line 411  mlibtoolize() Line 454  mlibtoolize()
    454   for abi in ${abis_to_run}   for abi in ${abis_to_run}
    455   do   do
    456   echo -e "${COLBLUE}*** ${COLGREEN}running mlibtoolize for ABI -${abi}${COLDEFAULT}"   echo -e "${COLBLUE}*** ${COLGREEN}running mlibtoolize for ABI -${abi}${COLDEFAULT}"
    457   cd ${SRCDIR}-${abi}/${SRCSUBDIR}   if [[ ${MULTILIB_ENTER_SRCDIR} = true ]]
    458     then
    459     cd ${SRCDIR}-${abi}/${SRCSUBDIR}
    460     fi
    461   oldmlibtoolize $@ || die   oldmlibtoolize $@ || die
    462   done   done
    463  }  }
    # Line 434  mautoreconf() Line 480  mautoreconf()
    480   for abi in ${abis_to_run}   for abi in ${abis_to_run}
    481   do   do
    482   echo -e "${COLBLUE}*** ${COLGREEN}running mautoreconf for ABI -${abi}${COLDEFAULT}"   echo -e "${COLBLUE}*** ${COLGREEN}running mautoreconf for ABI -${abi}${COLDEFAULT}"
    483   cd ${SRCDIR}-${abi}/${SRCSUBDIR}   if [[ ${MULTILIB_ENTER_SRCDIR} = true ]]
    484     then
    485     cd ${SRCDIR}-${abi}/${SRCSUBDIR}
    486     fi
    487   oldmautoreconf $@ || die   oldmautoreconf $@ || die
    488   done   done
    489  }  }
    # Line 458  minstalldocs() Line 507  minstalldocs()
    507    
    508   for abi in ${abis_to_run}   for abi in ${abis_to_run}
    509   do   do
    510   cd ${SRCDIR}-${abi}/${SRCSUBDIR}   if [[ ${MULTILIB_ENTER_SRCDIR} = true ]]
    511     then
    512     cd ${SRCDIR}-${abi}/${SRCSUBDIR}
    513     fi
    514   oldminstalldocs $@ || die   oldminstalldocs $@ || die
    515   done   done
    516  }  }
    Legend:
    Removed from v.29801  
    changed lines
      Added in v.31852