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/libzip.vars | 79 +++++++++++++++++++++++++++++---------------------------
 1 file changed, 41 insertions(+), 38 deletions(-)

(limited to 'vars/libzip.vars')

diff --git a/vars/libzip.vars b/vars/libzip.vars
index 43478f95..57b85798 100644
--- a/vars/libzip.vars
+++ b/vars/libzip.vars
@@ -9,33 +9,34 @@ pkg_libzip_configure() {
 	release) 	_build_type="Release"; ;;
 	*)		exit 1; ;;
 	esac;
-	rm -f config.cache;
-	env	CFLAGS="-L${PKG_PREFIX}/lib --sysroot=${PKG_PREFIX}"		\
-		PREFIX="" LDFLAGS="-lbz2"					\
-	cmake	-DBZIP2_INCLUDE_DIR="${PKG_PREFIX}/include"			\
-		-DBZIP2_LIBRARIES="${PKG_PREFIX}/lib/libbz2.lib.a"		\
-		-DCMAKE_AR="${PREFIX}/bin/${PKG_AR}"				\
-		-DCMAKE_BUILD_TYPE="${_build_type}"				\
-		-DCMAKE_C_COMPILER="${PREFIX}/bin/${PKG_CC}"			\
-		-DCMAKE_C_STANDARD_LIBRARIES="-lbz2 -lfts"			\
-		-DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE=ONLY			\
-		-DCMAKE_FIND_ROOT_PATH_MODE_PROGRAM=NEVER			\
-		-DCMAKE_INSTALL_PREFIX=						\
-		-DCMAKE_RANLIB="${PREFIX}/bin/${PKG_RANLIB}"			\
-		-DCMAKE_SYSTEM_NAME="Midipix"					\
-		-DENABLE_GNUTLS=:BOOL=ON					\
-		-DENABLE_MBEDTLS=:BOOL=OFF					\
-		-DGNUTLS_INCLUDE_DIR="${PKG_PREFIX}/include"			\
-		-DGNUTLS_LIBRARY="${PKG_PREFIX}/lib/libgnutls.lib.a"		\
-		-DLIBLZMA_INCLUDE_DIR="${PKG_PREFIX}/include"                   \
-		-DLIBLZMA_LIBRARY="${PKG_PREFIX}/lib/liblzma.lib.a"             \
-		-DNETTLE_INCLUDE_DIR="${PKG_PREFIX}/include"			\
-		-DNETTLE_LIBRARY="${PKG_PREFIX}/lib/libnettle.lib.a"		\
-		-DOPENSSL_CRYPTO_LIBRARY="${PKG_PREFIX}/lib/libcrypto.lib.a"	\
-		-DOPENSSL_SSL_LIBRARY="${PKG_PREFIX}/lib/libssl.lib.a"		\
-		-DZLIB_INCLUDE_DIR="${PKG_PREFIX}/include"			\
-		-DZLIB_LIBRARY="${PKG_PREFIX}/lib/libz.a"			\
-		"../libzip-${PKG_VERSION}";
+	if ! rtl_fileop rm config.cache								\
+	|| ! env CFLAGS="-L${PKG_PREFIX}/lib --sysroot=${PKG_PREFIX}" LDFLAGS="-lbz2" PREFIX=""	\
+		cmake	-DBZIP2_INCLUDE_DIR="${PKG_PREFIX}/include"				\
+			-DBZIP2_LIBRARIES="${PKG_PREFIX}/lib/libbz2.lib.a"			\
+			-DCMAKE_AR="${PREFIX}/bin/${PKG_AR}"					\
+			-DCMAKE_BUILD_TYPE="${_build_type}"					\
+			-DCMAKE_C_COMPILER="${PREFIX}/bin/${PKG_CC}"				\
+			-DCMAKE_C_STANDARD_LIBRARIES="-lbz2 -lfts"				\
+			-DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE=ONLY				\
+			-DCMAKE_FIND_ROOT_PATH_MODE_PROGRAM=NEVER				\
+			-DCMAKE_INSTALL_PREFIX=							\
+			-DCMAKE_RANLIB="${PREFIX}/bin/${PKG_RANLIB}"				\
+			-DCMAKE_SYSTEM_NAME="Midipix"						\
+			-DENABLE_GNUTLS=:BOOL=ON						\
+			-DENABLE_MBEDTLS=:BOOL=OFF						\
+			-DGNUTLS_INCLUDE_DIR="${PKG_PREFIX}/include"				\
+			-DGNUTLS_LIBRARY="${PKG_PREFIX}/lib/libgnutls.lib.a"			\
+			-DLIBLZMA_INCLUDE_DIR="${PKG_PREFIX}/include"                  		\
+			-DLIBLZMA_LIBRARY="${PKG_PREFIX}/lib/liblzma.lib.a"            		\
+			-DNETTLE_INCLUDE_DIR="${PKG_PREFIX}/include"				\
+			-DNETTLE_LIBRARY="${PKG_PREFIX}/lib/libnettle.lib.a"			\
+			-DOPENSSL_CRYPTO_LIBRARY="${PKG_PREFIX}/lib/libcrypto.lib.a"		\
+			-DOPENSSL_SSL_LIBRARY="${PKG_PREFIX}/lib/libssl.lib.a"			\
+			-DZLIB_INCLUDE_DIR="${PKG_PREFIX}/include"				\
+			-DZLIB_LIBRARY="${PKG_PREFIX}/lib/libz.a"				\
+			"../libzip-${PKG_VERSION}"; then
+		return 1;
+	fi;
 };
 
 pkg_libzip_host_configure() {
@@ -45,16 +46,18 @@ pkg_libzip_host_configure() {
 	release) 	_build_type="Release"; ;;
 	*)		exit 1; ;;
 	esac;
-	rm -f config.cache;
-	env	PREFIX="" LDFLAGS="-L${PKG_PREFIX}/lib -lbz2 -lfts -lssl"	\
-	cmake	-DCMAKE_BUILD_TYPE="${_build_type}"				\
-		-DCMAKE_C_STANDARD_LIBRARIES="-lbz2 -lcrypto -lfts"		\
-		-DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE=ONLY			\
-		-DCMAKE_FIND_ROOT_PATH_MODE_PROGRAM=NEVER			\
-		-DCMAKE_INSTALL_PREFIX=						\
-		-DENABLE_GNUTLS=:BOOL=OFF					\
-		-DENABLE_MBEDTLS=:BOOL=OFF					\
-		"../libzip-${PKG_VERSION}";
+	if ! rtl_fileop rm config.cache						\
+	|| ! env LDFLAGS="-L${PKG_PREFIX}/lib -lbz2 -lfts -lssl" PREFIX=""	\
+		cmake	-DCMAKE_BUILD_TYPE="${_build_type}"			\
+			-DCMAKE_C_STANDARD_LIBRARIES="-lbz2 -lcrypto -lfts"	\
+			-DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE=ONLY		\
+			-DCMAKE_FIND_ROOT_PATH_MODE_PROGRAM=NEVER		\
+			-DCMAKE_INSTALL_PREFIX=					\
+			-DENABLE_GNUTLS=:BOOL=OFF				\
+			-DENABLE_MBEDTLS=:BOOL=OFF				\
+			"../libzip-${PKG_VERSION}"; then
+		return 1;
+	fi;
 };
 
-# vim:filetype=sh
+# vim:filetype=sh textwidth=0
-- 
cgit v1.2.3