Magellan Linux

Diff of /trunk/include/cmake.sminc

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

revision 29810 by niro, Thu Oct 12 14:09:10 2017 UTC revision 29890 by niro, Tue Oct 17 13:56:49 2017 UTC
# Line 2  Line 2 
2  # cmake config tools  # cmake config tools
3    
4  SDEPEND="${SDEPEND}  SDEPEND="${SDEPEND}
5   >= dev-util/cmake-2.4.7"   >= dev-util/cmake-2.4.7
6     >= virtual/sed"
7    
8  # enables features like --enable-blah with make  # enables features like --enable-blah with make
9  cmake_enable()  cmake_enable()
# Line 112  cmake_opt() Line 113  cmake_opt()
113   echo "-D${feature}=${option}"   echo "-D${feature}=${option}"
114  }  }
115    
116    cmake_libsuffix()
117    {
118     local libsuffix
119    
120     libsuffix="$(mlibdir)"
121     libsuffix="${libsuffix/lib}"
122     echo "${libsuffix}"
123    }
124    
125  cmake_src_prepare()  cmake_src_prepare()
126  {  {
127   munpack ${SRCFILE} || die   munpack ${SRCFILE} || die
# Line 121  cmake_configure() Line 131  cmake_configure()
131  {  {
132   local configure_opts="$@"   local configure_opts="$@"
133   local default_opts   local default_opts
  local libsuffix="$(mlibdir)"  
  local libsuffix="${libsuffix/lib}"  
134    
135   # disable colors if requested   # disable colors if requested
136   if [[ ${NOCOLORS} = true ]]   if [[ ${NOCOLORS} = true ]]
# Line 133  cmake_configure() Line 141  cmake_configure()
141   default_opts+=" -DCMAKE_VERBOSE_MAKEFILE=ON"   default_opts+=" -DCMAKE_VERBOSE_MAKEFILE=ON"
142   default_opts+=" -DCMAKE_BUILD_TYPE=Release"   default_opts+=" -DCMAKE_BUILD_TYPE=Release"
143   default_opts+=" -DCMAKE_INSTALL_PREFIX=${PREFIX:-/usr}"   default_opts+=" -DCMAKE_INSTALL_PREFIX=${PREFIX:-/usr}"
144   default_opts+=" -DLIB_SUFFIX=${libsuffix}"   default_opts+=' -DLIB_SUFFIX=$(cmake_libsuffix)'
145   default_opts+=' -DLIB_INSTALL_DIR=${PREFIX:-/usr}/$(mlibdir)'   default_opts+=' -DLIB_INSTALL_DIR=${PREFIX:-/usr}/$(mlibdir)'
146    
147   if [[ ${MULTILIB_BUILD} = true ]]   if [[ ${MULTILIB_BUILD} = true ]]
# Line 145  cmake_configure() Line 153  cmake_configure()
153   [[ ! -z ${MULTILIB_ONLY_ABI} ]] && abis_to_run="${MULTILIB_ONLY_ABI}"   [[ ! -z ${MULTILIB_ONLY_ABI} ]] && abis_to_run="${MULTILIB_ONLY_ABI}"
154   for abi in ${abis_to_run}   for abi in ${abis_to_run}
155   do   do
156   cd ${BUILDDIR}/build-$(mabi)   cd ${BUILDDIR}/build-${abi}
157   cmake ${default_opts} ${configure_opts} ${SRCDIR}-$(mabi)/${SRCSUBDIR} || die   abi-${abi} cmake ${default_opts} ${configure_opts} ${SRCDIR}-${abi}/${SRCSUBDIR} || die
158   done   done
159   else   else
160   cd ${BUILDDIR}/build   cd ${BUILDDIR}/build
# Line 198  cmake_multilib_src_check() Line 206  cmake_multilib_src_check()
206  cmake_src_install()  cmake_src_install()
207  {  {
208   cd ${BUILDDIR}/build   cd ${BUILDDIR}/build
209   make DESTDIR=${BINDIR} install || die   make ${MAKEOPTS} DESTDIR=${BINDIR} install || die
210    
211   cd ${SRCDIR}   cd ${SRCDIR}
212   local i   local i
# Line 222  cmake_multilib_src_install() Line 230  cmake_multilib_src_install()
230   for abi in ${abis_to_run}   for abi in ${abis_to_run}
231   do   do
232   cd ${BUILDDIR}/build-${abi}   cd ${BUILDDIR}/build-${abi}
233   make DESTDIR=${BINDIR} install || die   abi-${abi} make ${MAKEOPTS} DESTDIR=${BINDIR} install || die
234    
235   cd ${SRCDIR}-${abi}   cd ${SRCDIR}-${abi}
236   local i   local i

Legend:
Removed from v.29810  
changed lines
  Added in v.29890