From 49b46005e7f7ebebcf6b43d451918c5462ac28d4 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?= <lucio@lucioillanes.de>
Date: Sun, 19 Nov 2017 14:21:25 +0000
Subject: vars/{build,env}.vars: diet, pt. II. vars/build.vars: install w/
 `DESTDIR=<prefix> PREFIX= prefix=' by default. vars/build.vars:cmake: build
 w/ -g0 -O2. vars/cmake.vars: build using cmake_host. vars/pkgconf_host.vars:
 remove & don't install ${PREFIX}/bin/pkg-config link to avoid confusing host
 packages. vars/{apr_util,chainport}.vars: replaced w/ corresponding
 ${PKG_BUILD_STEPS}. patches/perl-5.22.1.local.patch: pass -L. -lperl when
 linking. patches/smallbasic.local.patch: don't call pcre-config.
 subr/pkg_autoconf.subr, vars/{lib{caca,udns},toilet}.vars: always install
 config.sub after bootstrap. subr/pkg_disabled.subr: always silently finish
 disabled packages. subr/pkg_setup_{env,vars}.subr: split.
 subr/pkg_{build,install}.subr: always pass LIBTOOL=${PKG_SLIBTOOL:=slibtool}.
 subr/pkg_{{build,work}_dir,extract,setup_env}.subr: infer ${PKG_BUILD_DIR}
 from ${PKG_SUBDIR} given the absence of configure{,.{ac,in}}.

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

(limited to 'vars/cmake.vars')

diff --git a/vars/cmake.vars b/vars/cmake.vars
index ceee8157..bb03ae7b 100644
--- a/vars/cmake.vars
+++ b/vars/cmake.vars
@@ -3,36 +3,18 @@
 #
 
 pkg_cmake_configure() {
-	build_fileop cp "../cmake-${PKG_VERSION}/Modules/Platform/BSDOS.cmake" \
-		"../cmake-${PKG_VERSION}/Modules/Platform/Midipix.cmake";
-	build_fileop rm "../cmake-${PKG_VERSION}-host";
-	build_fileop mkdir "../cmake-${PKG_VERSION}-host";
-	build_fileop cd "../cmake-${PKG_VERSION}-host";
-	log_msg info "Bootstrapping cmake...";
-	(unset AR CC CXX RANLIB;
-	 "../cmake-${PKG_VERSION}/configure" ${PKG_CONFIGURE_ARGS};
-	 make ${DEFAULT_MAKEFLAGS_BUILD} "DESTDIR=${PREFIX}" install);
-	log_msg info "Finished bootstrapping cmake.";
-	stat "../cmake-${PKG_VERSION}";
-};
-
-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}";
+	build_fileop cp "${PREFIX}/share/cmake-${PKG_VERSION%.*}/Modules/Platform/BSDOS.cmake" \
+		"${PREFIX}/share/cmake-${PKG_VERSION%.*}/Modules/Platform/Midipix.cmake";
 	rm -f config.cache;
-	log_msg info "Calling cmake...";
-	_prefix="${PREFIX}";
 	env	CFLAGS="-L${PKG_PREFIX}/lib --sysroot=${PKG_PREFIX}"		\
-		PREFIX="" cmake							\
-		-DBZIP2_INCLUDE_DIR="${PKG_PREFIX}/include"			\
+		PREFIX=""							\
+	cmake	-DBZIP2_INCLUDE_DIR="${PKG_PREFIX}/include"			\
 		-DBZIP2_LIBRARIES="${PKG_PREFIX}/lib/libbz2.a"			\
-		-DCMAKE_AR="${_prefix}/bin/${AR}"				\
-		-DCMAKE_C_COMPILER="${_prefix}/bin/${CC}"			\
-		-DCMAKE_CXX_COMPILER="${_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="${_prefix}/bin/${RANLIB}"			\
+		-DCMAKE_RANLIB="${PREFIX}/bin/${RANLIB}"			\
 		-DCMAKE_SYSTEM_NAME=Midipix					\
 		-DCMAKE_USE_SYSTEM_BZIP2=ON					\
 		-DCMAKE_USE_SYSTEM_CURL=ON					\
@@ -53,9 +35,7 @@ pkg_cmake_build() {
 		-DLIBLZMA_LIBRARY="${PKG_PREFIX}/lib/liblzma.lib.a"		\
 		-DZLIB_INCLUDE_DIR="${PKG_PREFIX}/include"			\
 		-DZLIB_LIBRARY="${PKG_PREFIX}/lib/libz.a"			\
-			"../cmake-${PKG_VERSION}";
-	log_msg info "Calling make...";
-	make ${DEFAULT_MAKEFLAGS_BUILD};
+		"../cmake-${PKG_VERSION}";
 };
 
 # vim:filetype=sh
-- 
cgit v1.2.3