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/libjpeg_turbo.vars | 35 +++++++++++++++++++----------------
 1 file changed, 19 insertions(+), 16 deletions(-)

(limited to 'vars/libjpeg_turbo.vars')

diff --git a/vars/libjpeg_turbo.vars b/vars/libjpeg_turbo.vars
index 8ede8063..a8f1a8d5 100644
--- a/vars/libjpeg_turbo.vars
+++ b/vars/libjpeg_turbo.vars
@@ -3,19 +3,22 @@
 #
 
 pkg_libjpeg_turbo_configure() {
-        rm -f config.cache;
-        env     CFLAGS="-L${PKG_PREFIX}/lib --sysroot=${PKG_PREFIX}"            \
-                PREFIX=""                                                       \
-	cmake   -DCMAKE_FIND_ROOT_PATH_MODE_PROGRAM=NEVER                       \
-		-DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE=ONLY                        \
-		-DCMAKE_AR="${PREFIX}/bin/${PKG_AR}"                            \
-		-DCMAKE_C_COMPILER="${PREFIX}/bin/${PKG_CC}"                    \
-		-DCMAKE_BUILD_TYPE="Debug"                                      \
-		-DCMAKE_INSTALL_PREFIX=                                         \
-		-DCMAKE_RANLIB="${PREFIX}/bin/${PKG_RANLIB}"                    \
-		-DWITH_JPEG8=ON                                                 \
-		-DCMAKE_ASM_NASM_COMPILER="${PREFIX}/bin/${PKG_TARGET}-nasm"    \
-		-DCMAKE_ASM_NASM_OBJECT_FORMAT="win64"				\
-		-DWITH_SIMD=OFF							\
-                "../libjpeg-turbo-${PKG_VERSION}";
-}
+	if ! rtl_fileop rm config.cache							\
+	|| ! env CFLAGS="-L${PKG_PREFIX}/lib --sysroot=${PKG_PREFIX}" PREFIX=""		\
+		cmake	-DCMAKE_AR="${PREFIX}/bin/${PKG_AR}"				\
+			-DCMAKE_ASM_NASM_COMPILER="${PREFIX}/bin/${PKG_TARGET}-nasm"	\
+			-DCMAKE_ASM_NASM_OBJECT_FORMAT="win64"				\
+			-DCMAKE_BUILD_TYPE="Debug"					\
+			-DCMAKE_C_COMPILER="${PREFIX}/bin/${PKG_CC}"			\
+			-DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE="ONLY"			\
+			-DCMAKE_FIND_ROOT_PATH_MODE_PROGRAM="NEVER"			\
+			-DCMAKE_INSTALL_PREFIX=""					\
+			-DCMAKE_RANLIB="${PREFIX}/bin/${PKG_RANLIB}"			\
+			-DWITH_JPEG8="ON"						\
+			-DWITH_SIMD="OFF"						\
+			"../libjpeg-turbo-${PKG_VERSION}"; then
+		return 1;
+	fi;
+};
+
+# vim:filetype=sh textwidth=0
-- 
cgit v1.2.3