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 31579 by niro, Mon Dec 3 09:18:38 2018 UTC revision 33239 by niro, Mon Oct 21 09:58:50 2019 UTC
    # Line 79  meson_configure() Line 79  meson_configure()
    79   # must be escaped so the mlibdir variable gets evaluated later   # must be escaped so the mlibdir variable gets evaluated later
    80   default_opts+=' --libdir=/usr/$(mlibdir)'   default_opts+=' --libdir=/usr/$(mlibdir)'
    81   default_opts+=' --libexecdir=/usr/$(mlibdir)/${PNAME}'   default_opts+=' --libexecdir=/usr/$(mlibdir)/${PNAME}'
    82   all-abis meson setup ${default_opts} ${configure_opts} ${SRCDIR}-$(mabi)/${SRCSUBDIR} ${BUILDDIR}/build-$(mabi) || die   : ${MESON_SRCDIR="${SRCDIR}-$(mabi)/${SRCSUBDIR}"}
    83     : ${MESON_BUILDDIR="${BUILDDIR}/build-$(mabi)"}
    84     all-abis meson setup ${default_opts} ${configure_opts} ${MESON_SRCDIR} ${MESON_BUILDDIR} || die
    85   else   else
    86   # the mlibdir variable gets right now evaluated   # the mlibdir variable gets right now evaluated
    87   default_opts+=" --libdir=/usr/$(mlibdir)"   default_opts+=" --libdir=/usr/$(mlibdir)"
    88   default_opts+=" --libexecdir=/usr/$(mlibdir)/${PNAME}"   default_opts+=" --libexecdir=/usr/$(mlibdir)/${PNAME}"
    89   meson setup ${default_opts} ${configure_opts} ${SRCDIR}/${SRCSUBDIR} ${BUILDDIR}/build || die   : ${MESON_SRCDIR="${SRCDIR}/${SRCSUBDIR}"}
    90     : ${MESON_BUILDDIR="${BUILDDIR}/build"}
    91     meson setup ${default_opts} ${configure_opts} ${MESON_SRCDIR} ${MESON_BUILDDIR} || die
    92   fi   fi
    93  }  }
    94    
    # Line 101  mninja() Line 105  mninja()
    105   for abi in ${abis_to_run}   for abi in ${abis_to_run}
    106   do   do
    107   echo -e "${COLBLUE}*** ${COLGREEN}running ninja for ABI -${abi}${COLDEFAULT}"   echo -e "${COLBLUE}*** ${COLGREEN}running ninja for ABI -${abi}${COLDEFAULT}"
    108   abi-${abi} ninja -C ${SRCDIR}-$(mabi)/${SRCSUBDIR} -C ${BUILDDIR}/build-$(mabi) -v ${MAKEOPTS} "$@"   : ${MESON_SRCDIR="${SRCDIR}-$(mabi)/${SRCSUBDIR}"}
    109     : ${MESON_BUILDDIR="${BUILDDIR}/build-$(mabi)"}
    110     abi-${abi} ninja -C ${MESON_SRCDIR} -C ${MESON_BUILDDIR} -v ${MAKEOPTS} "$@"
    111   done   done
    112   else   else
    113   ninja -C ${SRCDIR}/${SRCSUBDIR} -C ${BUILDDIR}/build -v ${MAKEOPTS} "$@"   : ${MESON_SRCDIR="${SRCDIR}/${SRCSUBDIR}"}
    114     : ${MESON_BUILDDIR="${BUILDDIR}/build"}
    115     ninja -C ${MESON_SRCDIR} -C ${MESON_BUILDDIR} -v ${MAKEOPTS} "$@"
    116   fi   fi
    117  }  }
    118    
    # Line 121  meson_setup_builddir() Line 129  meson_setup_builddir()
    129   for abi in ${abis_to_run}   for abi in ${abis_to_run}
    130   do   do
    131   echo -e "${COLBLUE}*** ${COLGREEN}running ninja for ABI -${abi}${COLDEFAULT}"   echo -e "${COLBLUE}*** ${COLGREEN}running ninja for ABI -${abi}${COLDEFAULT}"
    132   abi-${abi} install -d ${BUILDDIR}/build-$(mabi) || die   : ${MESON_BUILDDIR="${BUILDDIR}/build-$(mabi)"}
    133     abi-${abi} install -d ${MESON_BUILDDIR} || die
    134   done   done
    135   else   else
    136   install -d ${BUILDDIR}/build || die   : ${MESON_BUILDDIR="${BUILDDIR}/build"}
    137     install -d ${MESON_BUILDDIR} || die
    138   fi   fi
    139  }  }
    140    
    # Line 132  meson_src_compile() Line 142  meson_src_compile()
    142  {  {
    143   if [[ ${MULTILIB_BUILD} != true ]]   if [[ ${MULTILIB_BUILD} != true ]]
    144   then   then
    145   cd ${SRCDIR}   : ${MESON_SRCDIR="${SRCDIR}"}
    146     cd ${MESON_SRCDIR}
    147   fi   fi
    148    
    149   meson_setup_builddir || die   meson_setup_builddir || die
    # Line 142  meson_src_compile() Line 153  meson_src_compile()
    153    
    154  meson_src_check()  meson_src_check()
    155  {  {
    156   cd ${BUILDDIR}/build   : ${MESON_BUILDDIR="${BUILDDIR}/build"}
    157     cd ${MESON_BUILDDIR}
    158   meson test || die   meson test || die
    159  }  }
    160    
    # Line 155  meson_multilib_src_check() Line 167  meson_multilib_src_check()
    167   [[ ! -z ${MULTILIB_ONLY_ABI} ]] && abis_to_run="${MULTILIB_ONLY_ABI}"   [[ ! -z ${MULTILIB_ONLY_ABI} ]] && abis_to_run="${MULTILIB_ONLY_ABI}"
    168   for abi in ${abis_to_run}   for abi in ${abis_to_run}
    169   do   do
    170   cd ${BUILDDIR}/build-${abi}   : ${MESON_BUILDDIR="${BUILDDIR}/build-${abi}"}
    171     cd ${MESON_BUILDDIR}
    172   meson test || die   meson test || die
    173   done   done
    174  }  }
    175    
    176  meson_src_install()  meson_src_install()
    177  {  {
    178   cd ${BUILDDIR}/build   : ${MESON_SRCDIR="${SRCDIR}"}
    179     : ${MESON_BUILDDIR="${BUILDDIR}/build"}
    180    
    181     cd ${MESON_BUILDDIR}
    182   DESTDIR=${BINDIR} ninja install || die   DESTDIR=${BINDIR} ninja install || die
    183    
    184   cd ${SRCDIR}   cd ${MESON_SRCDIR}
    185   local i   local i
    186   for i in ABOUT-NLS AUTHORS BUGS CHANGES ChangeLog COPYING \   for i in ABOUT-NLS AUTHORS BUGS CHANGES ChangeLog COPYING \
    187   FAQ LICENSE NEWS README TODO   FAQ LICENSE NEWS README TODO
    188   do   do
    189   if [ -f ${SRCDIR}/${i} ]   if [ -f ${MESON_SRCDIR}/${i} ]
    190   then   then
    191   minstalldocs ${i} || die   minstalldocs ${i} || die
    192   fi   fi
    # Line 186  meson_multilib_src_install() Line 202  meson_multilib_src_install()
    202   [[ ! -z ${MULTILIB_ONLY_ABI} ]] && abis_to_run="${MULTILIB_ONLY_ABI}"   [[ ! -z ${MULTILIB_ONLY_ABI} ]] && abis_to_run="${MULTILIB_ONLY_ABI}"
    203   for abi in ${abis_to_run}   for abi in ${abis_to_run}
    204   do   do
    205   cd ${BUILDDIR}/build-${abi}   : ${MESON_SRCDIR="${SRCDIR}-${abi}"}
    206     : ${MESON_BUILDDIR="${BUILDDIR}/build-${abi}"}
    207    
    208     cd ${MESON_BUILDDIR}
    209   DESTDIR=${BINDIR} ninja install || die   DESTDIR=${BINDIR} ninja install || die
    210    
    211   cd ${SRCDIR}-${abi}   cd ${MESON_SRCDIR}
    212   local i   local i
    213   for i in ABOUT-NLS AUTHORS BUGS CHANGES ChangeLog COPYING \   for i in ABOUT-NLS AUTHORS BUGS CHANGES ChangeLog COPYING \
    214   FAQ LICENSE NEWS README TODO   FAQ LICENSE NEWS README TODO
    215   do   do
    216   if [ -f ${SRCDIR}-${abi}/${i} ]   if [ -f ${MESON_SRCDIR}/${i} ]
    217   then   then
    218   minstalldocs ${i} || die   minstalldocs ${i} || die
    219   fi   fi
    Legend:
    Removed from v.31579  
    changed lines
      Added in v.33239