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 30900 by niro, Tue May 15 07:24:41 2018 UTC
    # Line 39  meson_without() Line 39  meson_without()
    39   echo "-Dwith-{feature}=false"   echo "-Dwith-{feature}=false"
    40  }  }
    41    
    42    meson_bool_true()
    43    {
    44     local feature="$1"
    45     meson_opt "feature" "true"
    46    }
    47    
    48    meson_bool_false()
    49    {
    50     local feature="$1"
    51     meson_opt "feature" "false"
    52    }
    53    
    54  # generic meson opts  # generic meson opts
    55  meson_opt()  meson_opt()
    56  {  {
    # Line 61  meson_configure() Line 73  meson_configure()
    73   default_opts+=" --prefix=/usr"   default_opts+=" --prefix=/usr"
    74   default_opts+=" --sysconfdir=/etc"   default_opts+=" --sysconfdir=/etc"
    75   default_opts+=" --localstatedir=/var/lib"   default_opts+=" --localstatedir=/var/lib"
      default_opts+=" --libdir=/usr/$(mlibdir)"  
      default_opts+=" --libexecdir=/usr/$(mlibdir)/${PNAME}"  
    76    
    77   if [[ ${MULTILIB_BUILD} = true ]]   if [[ ${MULTILIB_BUILD} = true ]]
    78   then   then
    79   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
    80     default_opts+=' --libdir=/usr/$(mlibdir)'
    81     default_opts+=' --libexecdir=/usr/$(mlibdir)/${PNAME}'
    82     all-abis meson setup ${default_opts} ${configure_opts} ${SRCDIR}-$(mabi)/${SRCSUBDIR} ${BUILDDIR}/build-$(mabi) || die
    83   else   else
    84   meson setup ${default_opts} ${configure_opts} ${SRCDIR}/${SRCSUBDIR} || die   # the mlibdir variable gets right now evaluated
    85     default_opts+=" --libdir=/usr/$(mlibdir)"
    86     default_opts+=" --libexecdir=/usr/$(mlibdir)/${PNAME}"
    87     meson setup ${default_opts} ${configure_opts} ${SRCDIR}/${SRCSUBDIR} ${BUILDDIR}/build || die
    88   fi   fi
    89  }  }
    90    
    # Line 76  mninja() Line 92  mninja()
    92  {  {
    93   if [[ ${MULTILIB_BUILD} = true ]]   if [[ ${MULTILIB_BUILD} = true ]]
    94   then   then
    95   all-abis ninja -C ${SRCDIR}-$(mabi)/${SRCSUBDIR} -v ${MAKEOPTS} "$@"   all-abis ninja -C ${SRCDIR}-$(mabi)/${SRCSUBDIR} -C ${BUILDDIR}/build-$(mabi) -v ${MAKEOPTS} "$@"
    96   else   else
    97   ninja -C ${SRCDIR}/${SRCSUBDIR} -v ${MAKEOPTS} "$@"   ninja -C ${SRCDIR}/${SRCSUBDIR} -C ${BUILDDIR}/build -v ${MAKEOPTS} "$@"
    98   fi   fi
    99  }  }
    100    
    Legend:
    Removed from v.29793  
    changed lines
      Added in v.30900