From bf9edfaed49c4387e181be454602e0cc65fe4382 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucio=20Andr=C3=A9s=20Illanes=20Albornoz?=
 <lucio@lucioillanes.de>
Date: Sun, 1 Mar 2020 21:09:37 +0000
Subject: General cleanup, pt. III.

dist/dist_digest.dist: removes obsolete dist file.
etc/{build.usage,README.md}: updated.
groups/000.host_tools.group:{autoconf,automake,gettext_tiny,install_strip,libtool,m4}_host: moved from groups/010.host_deps.group.
groups/221.native_packages_dev.group:lua: moved from groups/231.native_packages_etc.group.
groups/221.native_packages_dev.group:lua:${PKG_FORCE_AUTORECONF}: set.
groups/231.native_packages_etc.group:{mlogin,tdnf}:${PKG_FORCE_AUTORECONF}: set.
groups/241.native_packages_inet.group:nullmailer:${PKG_FORCE_AUTORECONF}: set.
groups/251.native_packages_lib.group:lib{asr,gpg_error}:${PKG_FORCE_AUTORECONF}: set.
midipix.env, etc/README.md, subr/pkg_configure_autotools.subr: adds FORCE_NO_AUTORECONF.
subr/rtl_fileop.subr: adds ch{mod,own} fileops.
vars/{check_updates,jamvm,lib{asr,gpg_error},lua,mlogin,tdnf}.vars: removes obsolete vars file.
---
 vars/cmake.vars | 82 +++++++++++++++++++++++++++++----------------------------
 1 file changed, 42 insertions(+), 40 deletions(-)

(limited to 'vars/cmake.vars')

diff --git a/vars/cmake.vars b/vars/cmake.vars
index 4417026c..4a830a6e 100644
--- a/vars/cmake.vars
+++ b/vars/cmake.vars
@@ -3,42 +3,43 @@
 #
 
 pkg_cmake_configure() {
-	rtl_fileop cp "${PREFIX}/share/cmake-${PKG_VERSION%.*}/Modules/Platform/BSDOS.cmake" \
-		"${PREFIX}/share/cmake-${PKG_VERSION%.*}/Modules/Platform/Midipix.cmake";
-	rm -f config.cache;
-	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="${PREFIX}/bin/${PKG_AR}"				\
-		-DCMAKE_C_COMPILER="${PREFIX}/bin/${PKG_CC}"			\
-		-DCMAKE_CXX_COMPILER="${PREFIX}/bin/${PKG_TARGET}-g++"		\
-		-DCMAKE_INSTALL_PREFIX=						\
-		-DCMAKE_RANLIB="${PREFIX}/bin/${PKG_RANLIB}"			\
-		-DCMAKE_SYSTEM_NAME=Midipix					\
-		-DCMAKE_USE_SYSTEM_BZIP2=ON					\
-		-DCMAKE_USE_SYSTEM_CURL=ON					\
-		-DCMAKE_USE_SYSTEM_EXPAT=OFF					\
-		-DCMAKE_USE_SYSTEM_LIBUV=ON					\
-		-DCMAKE_USE_SYSTEM_LIBARCHIVE=ON				\
-		-DCMAKE_USE_SYSTEM_ZLIB=ON					\
-		-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.lib.a"	\
-		-DKWSYS_LFS_WORKS=YES						\
-		-DLibUV_INCLUDE_DIR="${PKG_PREFIX}/include"			\
-		-DLibUV_LIBRARY="${PKG_PREFIX}/lib/libuv.1.0.0.lib.a"		\
-		-DLibArchive_INCLUDE_DIR="${PKG_PREFIX}/include"		\
-		-DLibArchive_LIBRARY="${PKG_PREFIX}/lib/libarchive.lib.a"	\
-		-DLIBLZMA_HAS_AUTO_DECODER=YES					\
-		-DLIBLZMA_HAS_EASY_ENCODER=YES					\
-		-DLIBLZMA_HAS_LZMA_PRESET=YES					\
-		-DLIBLZMA_INCLUDE_DIR="${PKG_PREFIX}/include"			\
-		-DLIBLZMA_LIBRARY="${PKG_PREFIX}/lib/liblzma.lib.a"		\
-		-DZLIB_INCLUDE_DIR="${PKG_PREFIX}/include"			\
-		-DZLIB_LIBRARY="${PKG_PREFIX}/lib/libz.a"			\
-		"../cmake-${PKG_VERSION}";
+	if ! rtl_fileop cp "${PREFIX}/share/cmake-${PKG_VERSION%.*}/Modules/Platform/BSDOS.cmake"	\
+		"${PREFIX}/share/cmake-${PKG_VERSION%.*}/Modules/Platform/Midipix.cmake"		\
+	|| ! rtl_fileop rm config.cache									\
+	|| ! 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="${PREFIX}/bin/${PKG_AR}"						\
+			-DCMAKE_C_COMPILER="${PREFIX}/bin/${PKG_CC}"					\
+			-DCMAKE_CXX_COMPILER="${PREFIX}/bin/${PKG_TARGET}-g++"				\
+			-DCMAKE_INSTALL_PREFIX=								\
+			-DCMAKE_RANLIB="${PREFIX}/bin/${PKG_RANLIB}"					\
+			-DCMAKE_SYSTEM_NAME=Midipix							\
+			-DCMAKE_USE_SYSTEM_BZIP2=ON							\
+			-DCMAKE_USE_SYSTEM_CURL=ON							\
+			-DCMAKE_USE_SYSTEM_EXPAT=OFF							\
+			-DCMAKE_USE_SYSTEM_LIBARCHIVE=ON						\
+			-DCMAKE_USE_SYSTEM_LIBUV=ON							\
+			-DCMAKE_USE_SYSTEM_ZLIB=ON							\
+			-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.lib.a"			\
+			-DKWSYS_LFS_WORKS=YES								\
+			-DLibArchive_INCLUDE_DIR="${PKG_PREFIX}/include"				\
+			-DLibArchive_LIBRARY="${PKG_PREFIX}/lib/libarchive.lib.a"			\
+			-DLIBLZMA_HAS_AUTO_DECODER=YES							\
+			-DLIBLZMA_HAS_EASY_ENCODER=YES							\
+			-DLIBLZMA_HAS_LZMA_PRESET=YES							\
+			-DLIBLZMA_INCLUDE_DIR="${PKG_PREFIX}/include"					\
+			-DLIBLZMA_LIBRARY="${PKG_PREFIX}/lib/liblzma.lib.a"				\
+			-DLibUV_INCLUDE_DIR="${PKG_PREFIX}/include"					\
+			-DLibUV_LIBRARY="${PKG_PREFIX}/lib/libuv.1.0.0.lib.a"				\
+			-DZLIB_INCLUDE_DIR="${PKG_PREFIX}/include"					\
+			-DZLIB_LIBRARY="${PKG_PREFIX}/lib/libz.a"					\
+			"../cmake-${PKG_VERSION}"; then
+		return 1;
+	fi;
 };
 
 pkg_cmake_install_make_pre() {
@@ -49,13 +50,14 @@ pkg_cmake_install_make_pre() {
 };
 
 pkg_cmake_host_configure() {
-	rm -f config.cache;
-	cmake	-DCURSES_NCURSES_LIBRARY="${PKG_PREFIX}/lib/libncurses.so"	\
-		"../cmake-${PKG_VERSION}";
+	if ! rtl_fileop rm config.cache									\
+	|| ! cmake -DCURSES_NCURSES_LIBRARY="${PKG_PREFIX}/lib/libncurses.so" "../cmake-${PKG_VERSION}"; then
+		return 1;
+	fi;
 };
 
 pkg_cmake_host_install_make_pre() {
 	pkg_cmake_install_make_pre;
 };
 
-# vim:filetype=sh
+# vim:filetype=sh textwidth=0
-- 
cgit v1.2.3