From 0610d8b6288e055b7b5e63d6cfe49333b5842cb8 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: Wed, 16 Nov 2016 15:04:04 +0100
Subject: cmake: fix build and clean up cmake.vars.

---
 vars/cmake.vars | 41 ++++++++++++-----------------------------
 1 file changed, 12 insertions(+), 29 deletions(-)

(limited to 'vars/cmake.vars')

diff --git a/vars/cmake.vars b/vars/cmake.vars
index 0eae553f..42b31504 100644
--- a/vars/cmake.vars
+++ b/vars/cmake.vars
@@ -2,33 +2,23 @@
 # . ./build.vars and set -o errexit -o noglob are assumed.
 #
 
-pkg_cmake_configure_pre() {
+pkg_cmake_configure() {
 	cp -p ../cmake-${PKG_VERSION}/Modules/Platform/BSDOS.cmake \
 		../cmake-${PKG_VERSION}/Modules/Platform/Midipix.cmake;
-
-	rm -rf ../cmake-${PKG_VERSION}-host;
-	mkdir  ../cmake-${PKG_VERSION}-host;
-	cd     ../cmake-${PKG_VERSION}-host;
-
-	echo   XXXXXXXXXXXXXXXXXXXXXXXXXXXX
-
-	(unset AR ARFLAGS CC CFLAGS RANLIB RANLIBFLAGS;
-		../cmake-${PKG_VERSION}/configure ${PKG_CONFIGURE_ARGS};
-		make DESTDIR=${PREFIX} install;
-	);
-
-	set_build_script_done configure -clean;
-	echo   YYYYYYYYYYYYYYYYYYYYYYYYYYYY
+	secure_rm ../cmake-${PKG_VERSION}-host;
+	insecure_mkdir ../cmake-${PKG_VERSION}-host;
+	cd ../cmake-${PKG_VERSION}-host;
+	log_msg info "Bootstrapping cmake...";
+	(unset AR CC RANLIB;
+	 ../cmake-${PKG_VERSION}/configure ${PKG_CONFIGURE_ARGS};
+	 make DESTDIR=${PREFIX} install);
+	log_msg info "Finished bootstrapping cmake.";
+	stat ../cmake-${PKG_VERSION};
 };
 
-pkg_cmake_configure() {
-	stat ../cmake-${PKG_VERSION}
-	set_build_script_done configure -clean;
-}
-
 pkg_cmake_build() {
 	rm -f config.cache;
-
+	log_msg info "Calling cmake...";
 	env CFLAGS="--sysroot=${PKG_PREFIX}" cmake				\
 		-DBZIP2_INCLUDE_DIR=${PKG_PREFIX}/include			\
 		-DBZIP2_LIBRARIES=${PKG_PREFIX}/lib/libbz2.a			\
@@ -54,15 +44,8 @@ pkg_cmake_build() {
 		-DLIBLZMA_LIBRARY=${PKG_PREFIX}/lib/liblzma.lib.a		\
 		-DZLIB_INCLUDE_DIR=${PKG_PREFIX}/include 			\
 		-DZLIB_LIBRARY=z ../cmake-${PKG_VERSION};
-
+	log_msg info "Calling make...";
 	make ${DEFAULT_MAKEFLAGS_BUILD};
-	set_build_script_done build -install
 };
 
-pkg_cmake_install() {
-	make DESTDIR=${PKG_PREFIX} install;
-	set_build_script_done install -finish
-	set_build_script_done finish
-}
-
 # vim:filetype=sh
-- 
cgit v1.2.3