diff options
| author | Lucio Andrés Illanes Albornoz (arab, vxp) <l.illanes@gmx.de> | 2017-02-05 19:08:11 +0100 |
|---|---|---|
| committer | Lucio Andrés Illanes Albornoz (arab, vxp) <l.illanes@gmx.de> | 2017-02-05 21:24:26 +0000 |
| commit | 8022154108dde14f47722bd1a18a475ef2a3f95d (patch) | |
| tree | 6215baa0f5338e3cfc7693f8bbdfaeef844744ad /vars/cmake.vars | |
| parent | c1aae3835fe7d398b3e22f915fe6d7913b17ee44 (diff) | |
| download | midipix_build-8022154108dde14f47722bd1a18a475ef2a3f95d.tar.bz2 midipix_build-8022154108dde14f47722bd1a18a475ef2a3f95d.tar.xz | |
build.sh, {subr,vars}/*: general cleanup.
Diffstat (limited to 'vars/cmake.vars')
| -rw-r--r-- | vars/cmake.vars | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/vars/cmake.vars b/vars/cmake.vars index 160c8fcb..bbcfacb6 100644 --- a/vars/cmake.vars +++ b/vars/cmake.vars @@ -1,5 +1,5 @@ # -# . ./build.vars and set -o errexit -o noglob are assumed. +# set -o errexit -o noglob are assumed. # pkg_cmake_configure() { @@ -17,21 +17,22 @@ pkg_cmake_configure() { }; pkg_cmake_build() { + local _prefix; build_fileop rm ../cmake-${PKG_VERSION}-native-${PKG_TARGET}; build_fileop mkdir ../cmake-${PKG_VERSION}-native-${PKG_TARGET}; build_fileop cd ${WORKDIR}/cmake-${PKG_VERSION}-native-${PKG_TARGET}; rm -f config.cache; log_msg info "Calling cmake..."; - _pcb_prefix=${PREFIX}; + _prefix=${PREFIX}; env CFLAGS="-L${PKG_PREFIX}/lib --sysroot=${PKG_PREFIX}" \ PREFIX="" cmake \ -DBZIP2_INCLUDE_DIR=${PKG_PREFIX}/include \ -DBZIP2_LIBRARIES=${PKG_PREFIX}/lib/libbz2.a \ - -DCMAKE_AR=${_pcb_prefix}/bin/${AR} \ - -DCMAKE_C_COMPILER=${_pcb_prefix}/bin/${CC} \ - -DCMAKE_CXX_COMPILER=${_pcb_prefix}/bin/${PKG_TARGET}-g++ \ + -DCMAKE_AR=${_prefix}/bin/${AR} \ + -DCMAKE_C_COMPILER=${_prefix}/bin/${CC} \ + -DCMAKE_CXX_COMPILER=${_prefix}/bin/${PKG_TARGET}-g++ \ -DCMAKE_INSTALL_PREFIX= \ - -DCMAKE_RANLIB=${_pcb_prefix}/bin/${RANLIB} \ + -DCMAKE_RANLIB=${_prefix}/bin/${RANLIB} \ -DCMAKE_SYSTEM_NAME=Midipix \ -DCMAKE_USE_SYSTEM_BZIP2=ON \ -DCMAKE_USE_SYSTEM_CURL=ON \ @@ -53,7 +54,6 @@ pkg_cmake_build() { -DZLIB_INCLUDE_DIR=${PKG_PREFIX}/include \ -DZLIB_LIBRARY=${PKG_PREFIX}/lib/libz.a \ ../cmake-${PKG_VERSION}; - unset _pcb_prefix; log_msg info "Calling make..."; make ${DEFAULT_MAKEFLAGS_BUILD}; }; |