Magellan Linux

Diff of /trunk/include/meson.sminc

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

revision 29798 by niro, Thu Oct 12 12:07:06 2017 UTC revision 30916 by niro, Wed May 16 08:06:16 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     # 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   all-abis meson setup ${default_opts} ${configure_opts} ${SRCDIR}-$(mabi)/${SRCSUBDIR} ${BUILDDIR}/build-$(mabi) || die
83   else   else
84     # 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   meson setup ${default_opts} ${configure_opts} ${SRCDIR}/${SRCSUBDIR} ${BUILDDIR}/build || die
88   fi   fi
89  }  }

Legend:
Removed from v.29798  
changed lines
  Added in v.30916