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 29793 by niro, Thu Oct 12 11:38:00 2017 UTC revision 30741 by niro, Tue Mar 27 12:08:28 2018 UTC
    # Line 61  meson_configure() Line 61  meson_configure()
    61   default_opts+=" --prefix=/usr"   default_opts+=" --prefix=/usr"
    62   default_opts+=" --sysconfdir=/etc"   default_opts+=" --sysconfdir=/etc"
    63   default_opts+=" --localstatedir=/var/lib"   default_opts+=" --localstatedir=/var/lib"
    64   default_opts+=" --libdir=/usr/$(mlibdir)"   default_opts+=' --libexecdir=/usr/$(mlibdir)/${PNAME}'
      default_opts+=" --libexecdir=/usr/$(mlibdir)/${PNAME}"  
    65    
    66   if [[ ${MULTILIB_BUILD} = true ]]   if [[ ${MULTILIB_BUILD} = true ]]
    67   then   then
    68   ABI_DO_NOT_ENTER_SRCDIR=false all-abis meson setup ${default_opts} ${configure_opts} ${SRCDIR}-$(mabi)/${SRCSUBDIR} || die   # must be escaped so the mlibdir variable gets evaluated later
    69     default_opts+=' --libdir=/usr/$(mlibdir)'
    70     all-abis meson setup ${default_opts} ${configure_opts} ${SRCDIR}-$(mabi)/${SRCSUBDIR} ${BUILDDIR}/build-$(mabi) || die
    71   else   else
    72   meson setup ${default_opts} ${configure_opts} ${SRCDIR}/${SRCSUBDIR} || die   # the mlibdir variable gets right now evaluated
    73     default_opts+=" --libdir=/usr/$(mlibdir)"
    74     meson setup ${default_opts} ${configure_opts} ${SRCDIR}/${SRCSUBDIR} ${BUILDDIR}/build || die
    75   fi   fi
    76  }  }
    77    
    # Line 76  mninja() Line 79  mninja()
    79  {  {
    80   if [[ ${MULTILIB_BUILD} = true ]]   if [[ ${MULTILIB_BUILD} = true ]]
    81   then   then
    82   all-abis ninja -C ${SRCDIR}-$(mabi)/${SRCSUBDIR} -v ${MAKEOPTS} "$@"   all-abis ninja -C ${SRCDIR}-$(mabi)/${SRCSUBDIR} -C ${BUILDDIR}/build-$(mabi) -v ${MAKEOPTS} "$@"
    83   else   else
    84   ninja -C ${SRCDIR}/${SRCSUBDIR} -v ${MAKEOPTS} "$@"   ninja -C ${SRCDIR}/${SRCSUBDIR} -C ${BUILDDIR}/build -v ${MAKEOPTS} "$@"
    85   fi   fi
    86  }  }
    87    
    Legend:
    Removed from v.29793  
    changed lines
      Added in v.30741