From 0ddccef3fa9390e7d8a7fcfb040b0bd3ef2fccdd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucio=20Andr=C3=A9s=20Illanes=20Albornoz=20=28arab=2C=20vx?=
 =?UTF-8?q?p=29?= <l.illanes@gmx.de>
Date: Sat, 19 Nov 2016 12:23:58 +0100
Subject: cmake: fix build episode 29 (via midipix.)

---
 vars/cmake.vars | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

(limited to 'vars/cmake.vars')

diff --git a/vars/cmake.vars b/vars/cmake.vars
index 4a13f37d..a6d36341 100644
--- a/vars/cmake.vars
+++ b/vars/cmake.vars
@@ -17,14 +17,21 @@ pkg_cmake_configure() {
 };
 
 pkg_cmake_build() {
+	secure_rm ../cmake-${PKG_VERSION}-native-${PKG_TARGET};
+	insecure_mkdir ../cmake-${PKG_VERSION}-native-${PKG_TARGET};
+	cd ${WORKDIR}/cmake-${PKG_VERSION}-native-${PKG_TARGET};
 	rm -f config.cache;
 	log_msg info "Calling cmake...";
-	env CFLAGS="--sysroot=${PKG_PREFIX}" cmake				\
+	_pcb_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_C_COMPILER=${PREFIX}/bin/${CC}				\
-		-DCMAKE_CXX_COMPILER=${PREFIX}/bin/${PKG_TARGET}-g++		\
-		-DCMAKE_INSTALL_PREFIX=../cmake-${PKG_VERSION}			\
+		-DCMAKE_AR=${_pcb_prefix}/bin/${AR}				\
+		-DCMAKE_C_COMPILER=${_pcb_prefix}/bin/${CC}			\
+		-DCMAKE_CXX_COMPILER=${_pcb_prefix}/bin/${PKG_TARGET}-g++	\
+		-DCMAKE_INSTALL_PREFIX=						\
+		-DCMAKE_RANLIB=${_pcb_prefix}/bin/${RANLIB}			\
 		-DCMAKE_SYSTEM_NAME=Midipix					\
 		-DCMAKE_USE_SYSTEM_BZIP2=ON					\
 		-DCMAKE_USE_SYSTEM_CURL=ON					\
@@ -34,6 +41,7 @@ pkg_cmake_build() {
 		-DCMAKE_VERBOSE_MAKEFILE=ON					\
 		-DCURL_INCLUDE_DIR=${PKG_PREFIX}/include/curl			\
 		-DCURL_LIBRARY=${PKG_PREFIX}/lib/libcurl.lib.a			\
+		-DCURSES_NCURSES_LIBRARY=${PKG_PREFIX}/lib/libncurses.so	\
 		-DKWSYS_LFS_WORKS=YES						\
 		-DLibArchive_INCLUDE_DIR=${PKG_PREFIX}/include			\
 		-DLibArchive_LIBRARY=${PKG_PREFIX}/lib/libarchive.lib.a		\
@@ -43,7 +51,9 @@ pkg_cmake_build() {
 		-DLIBLZMA_INCLUDE_DIR=${PKG_PREFIX}/include			\
 		-DLIBLZMA_LIBRARY=${PKG_PREFIX}/lib/liblzma.lib.a		\
 		-DZLIB_INCLUDE_DIR=${PKG_PREFIX}/include 			\
-		-DZLIB_LIBRARY=z ../cmake-${PKG_VERSION};
+		-DZLIB_LIBRARY=z						\
+			../cmake-${PKG_VERSION};
+	unset _pcb_prefix;
 	log_msg info "Calling make...";
 	make ${DEFAULT_MAKEFLAGS_BUILD};
 };
-- 
cgit v1.2.3