Magellan Linux

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

    Diff of /trunk/include/meson.sminc

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

    revision 33259 by niro, Mon Oct 21 09:58:50 2019 UTC revision 33260 by niro, Tue Oct 22 12:29:09 2019 UTC
    # Line 68  meson_configure() Line 68  meson_configure()
    68  {  {
    69   local configure_opts="$@"   local configure_opts="$@"
    70   local default_opts   local default_opts
    71     [[ -n ${MESON_SRCDIR} ]] || local MESON_SRCDIR
    72     [[ -n ${MESON_BUILDDIR} ]] || local MESON_BUILDDIR
    73    
    74   default_opts+=" --buildtype=release"   default_opts+=" --buildtype=release"
    75   default_opts+=" --prefix=/usr"   default_opts+=" --prefix=/usr"
    # Line 96  mninja() Line 98  mninja()
    98  {  {
    99   local abi   local abi
    100   local abis_to_run="${MULTILIB_ABIS}"   local abis_to_run="${MULTILIB_ABIS}"
    101     [[ -n ${MESON_SRCDIR} ]] || local MESON_SRCDIR
    102     [[ -n ${MESON_BUILDDIR} ]] || local MESON_BUILDDIR
    103    
    104   # respect MULTILIB_ONLY_ABI variable   # respect MULTILIB_ONLY_ABI variable
    105   [[ ! -z ${MULTILIB_ONLY_ABI} ]] && abis_to_run="${MULTILIB_ONLY_ABI}"   [[ ! -z ${MULTILIB_ONLY_ABI} ]] && abis_to_run="${MULTILIB_ONLY_ABI}"
    # Line 120  meson_setup_builddir() Line 124  meson_setup_builddir()
    124  {  {
    125   local abi   local abi
    126   local abis_to_run="${MULTILIB_ABIS}"   local abis_to_run="${MULTILIB_ABIS}"
    127     [[ -n ${MESON_BUILDDIR} ]] || local MESON_BUILDDIR
    128    
    129   # respect MULTILIB_ONLY_ABI variable   # respect MULTILIB_ONLY_ABI variable
    130   [[ ! -z ${MULTILIB_ONLY_ABI} ]] && abis_to_run="${MULTILIB_ONLY_ABI}"   [[ ! -z ${MULTILIB_ONLY_ABI} ]] && abis_to_run="${MULTILIB_ONLY_ABI}"
    # Line 140  meson_setup_builddir() Line 145  meson_setup_builddir()
    145    
    146  meson_src_compile()  meson_src_compile()
    147  {  {
    148     [[ -n ${MESON_SRCDIR} ]] || local MESON_SRCDIR
    149    
    150   if [[ ${MULTILIB_BUILD} != true ]]   if [[ ${MULTILIB_BUILD} != true ]]
    151   then   then
    152   : ${MESON_SRCDIR="${SRCDIR}"}   : ${MESON_SRCDIR="${SRCDIR}"}
    # Line 153  meson_src_compile() Line 160  meson_src_compile()
    160    
    161  meson_src_check()  meson_src_check()
    162  {  {
    163     [[ -n ${MESON_BUILDDIR} ]] || local MESON_BUILDDIR
    164    
    165   : ${MESON_BUILDDIR="${BUILDDIR}/build"}   : ${MESON_BUILDDIR="${BUILDDIR}/build"}
    166   cd ${MESON_BUILDDIR}   meson test -C ${MESON_BUILDDIR} || die
      meson test || die  
    167  }  }
    168    
    169  meson_multilib_src_check()  meson_multilib_src_check()
    170  {  {
    171   local abi   local abi
    172   local abis_to_run="${MULTILIB_ABIS}"   local abis_to_run="${MULTILIB_ABIS}"
    173     [[ -n ${MESON_BUILDDIR} ]] || local MESON_BUILDDIR
    174    
    175   # respect MULTILIB_ONLY_ABI variable   # respect MULTILIB_ONLY_ABI variable
    176   [[ ! -z ${MULTILIB_ONLY_ABI} ]] && abis_to_run="${MULTILIB_ONLY_ABI}"   [[ ! -z ${MULTILIB_ONLY_ABI} ]] && abis_to_run="${MULTILIB_ONLY_ABI}"
    177   for abi in ${abis_to_run}   for abi in ${abis_to_run}
    178   do   do
    179   : ${MESON_BUILDDIR="${BUILDDIR}/build-${abi}"}   : ${MESON_BUILDDIR="${BUILDDIR}/build-$(mabi)"}
    180   cd ${MESON_BUILDDIR}   abi-${abi} meson test -C ${MESON_BUILDDIR} || die
      meson test || die  
    181   done   done
    182  }  }
    183    
    184  meson_src_install()  meson_src_install()
    185  {  {
    186     [[ -n ${MESON_SRCDIR} ]] || local MESON_SRCDIR
    187    
    188   : ${MESON_SRCDIR="${SRCDIR}"}   : ${MESON_SRCDIR="${SRCDIR}"}
      : ${MESON_BUILDDIR="${BUILDDIR}/build"}  
    189    
    190   cd ${MESON_BUILDDIR}   DESTDIR=${BINDIR} mninja install || die
      DESTDIR=${BINDIR} ninja install || die  
    191    
    192   cd ${MESON_SRCDIR}   cd ${MESON_SRCDIR}
    193   local i   local i
    # Line 197  meson_multilib_src_install() Line 205  meson_multilib_src_install()
    205  {  {
    206   local abi   local abi
    207   local abis_to_run="${MULTILIB_ABIS}"   local abis_to_run="${MULTILIB_ABIS}"
    208     [[ -n ${MESON_SRCDIR} ]] || local MESON_SRCDIR
    209    
    210     DESTDIR=${BINDIR} mninja install || die
    211    
    212   # respect MULTILIB_ONLY_ABI variable   # respect MULTILIB_ONLY_ABI variable
    213   [[ ! -z ${MULTILIB_ONLY_ABI} ]] && abis_to_run="${MULTILIB_ONLY_ABI}"   [[ ! -z ${MULTILIB_ONLY_ABI} ]] && abis_to_run="${MULTILIB_ONLY_ABI}"
    214   for abi in ${abis_to_run}   for abi in ${abis_to_run}
    215   do   do
    216   : ${MESON_SRCDIR="${SRCDIR}-${abi}"}   : ${MESON_SRCDIR="${SRCDIR}-$(mabi)"}
      : ${MESON_BUILDDIR="${BUILDDIR}/build-${abi}"}  
       
      cd ${MESON_BUILDDIR}  
      DESTDIR=${BINDIR} ninja install || die  
    217    
    218   cd ${MESON_SRCDIR}   cd ${MESON_SRCDIR}
    219   local i   local i
    Legend:
    Removed from v.33259  
    changed lines
      Added in v.33260